diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index bb4e34b5af27..dc030fa1c809 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -123,7 +123,7 @@ void EntryCache::destroy (Entry * entry)
 }
 
 // highbit():= log2() + 1 (complexity O(1))
-static int highbit(std::size_t n)
+static constexpr int highbit(std::size_t n)
 {
     int k = 1;
 
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index b787248349ac..ebdbd392ee18 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -39,7 +39,7 @@ struct Entry;
 class PageCache :
     public store::OStoreObject
 {
-    static size_t const theTableSize = 32;
+    static size_t constexpr theTableSize = 32;
     static_assert((theTableSize & (theTableSize-1)) == 0, "table size should be a power of 2");
 
     Entry **     m_hash_table;