diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2016-08-30 21:03:38 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-31 07:16:10 +0000 |
commit | e53bb6a0f0257da68790437d7ac39a7e103fe9ea (patch) | |
tree | d581509ae018da24dced9b3481a949ff75551f7b | |
parent | 7173a4edab9a7c2e73d1caceb4422445a4d1c502 (diff) |
store: remove STORE_IMPL_ISP2 and STORE_IMPL_CONCAT.
Change-Id: Iec6cff8da24515f17a5ad2b9ba6e1f92df124921
Reviewed-on: https://gerrit.libreoffice.org/28508
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r-- | store/source/storbase.hxx | 9 | ||||
-rw-r--r-- | store/source/storcach.hxx | 2 |
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]; |