2 files changed, 1 insertions, 10 deletions
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index c280e5d517e7..6606f5507570 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -44,15 +44,6 @@
  *
  *======================================================================*/
 
-#ifndef STORE_IMPL_ISP2
-#define STORE_IMPL_ISP2(value) (((value) & ((value) - 1)) == 0)
-#endif
-
-#ifndef STORE_IMPL_CONCAT
-#define STORE_IMPL_CONCAT(x, y) STORE_IMPL_CONCAT2(x,y)
-#define STORE_IMPL_CONCAT2(x, y) x##y
-#endif
-
 namespace store
 {
 
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index bc53fd6c6566..099339778205 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -43,7 +43,7 @@ class PageCache :
 {
     // Representation
     static size_t const theTableSize = 32;
-    static_assert(STORE_IMPL_ISP2(theTableSize), "must be the case");
+    static_assert((theTableSize & (theTableSize-1)) == 0, "table size should be a power of 2");
 
     Entry **     m_hash_table;
     Entry *      m_hash_table_0[theTableSize];