summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-05 20:54:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-05 22:21:49 +0000
commit4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5 (patch)
tree22fc10679131c72993615d0fa634460d14a15ec8 /store
parent076b098ddf80fc78773d3ed97b7fd50dbcb4ebb6 (diff)
convert all remaining BOOST_STATIC_ASSERT to static_assert
and we can include a few less headers Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8
Diffstat (limited to 'store')
-rw-r--r--store/source/storbase.hxx3
-rw-r--r--store/source/storbios.cxx4
-rw-r--r--store/source/storcach.cxx5
-rw-r--r--store/source/stordata.hxx7
-rw-r--r--store/source/stortree.hxx3
5 files changed, 8 insertions, 14 deletions
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index d168ab1fc624..2cc68bd2864f 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -23,7 +23,6 @@
#include "sal/config.h"
#include "salhelper/simplereferenceobject.hxx"
-#include "boost/static_assert.hpp"
#include "sal/types.h"
#include "rtl/alloc.h"
@@ -425,7 +424,7 @@ struct PageData
*/
static const size_t theSize = sizeof(G) + sizeof(D) + 2 * sizeof(L);
static const sal_uInt16 thePageSize = theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= thePageSize, "must be at least thePageSize");
/** location.
*/
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 1342abbce0a2..bea35d22c023 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -19,8 +19,6 @@
#include "sal/config.h"
-#include "boost/static_assert.hpp"
-
#include "storbios.hxx"
#include "sal/types.h"
@@ -166,7 +164,7 @@ struct SuperBlockPage
*/
static const size_t theSize = 2 * SuperBlock::theSize;
static const sal_uInt16 thePageSize = theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= thePageSize, "must be at least thePageSize");
/** Allocation.
*/
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 6ddb2db389dc..ed86b3e31d3a 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -20,7 +20,6 @@
#include "sal/config.h"
#include "boost/noncopyable.hpp"
-#include "boost/static_assert.hpp"
#include "storcach.hxx"
@@ -230,7 +229,7 @@ class PageCache_Impl :
{
// Representation
static size_t const theTableSize = 32;
- BOOST_STATIC_ASSERT(STORE_IMPL_ISP2(theTableSize));
+ static_assert(STORE_IMPL_ISP2(theTableSize), "must be the case");
Entry ** m_hash_table;
Entry * m_hash_table_0[theTableSize];
@@ -291,7 +290,7 @@ PageCache_Impl::PageCache_Impl (sal_uInt16 nPageSize)
m_nMissed (0)
{
static size_t const theSize = SAL_N_ELEMENTS(m_hash_table_0);
- BOOST_STATIC_ASSERT(theSize == theTableSize);
+ static_assert(theSize == theTableSize, "must be equal");
memset(m_hash_table_0, 0, sizeof(m_hash_table_0));
}
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index d558f6c69b76..ae9e916c4bd8 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/static_assert.hpp"
#include "sal/types.h"
#include "sal/macros.h"
@@ -58,7 +57,7 @@ struct OStoreDataPageData : public store::OStorePageData
*/
static const size_t theSize = 0;
static const sal_uInt16 thePageSize = base::theSize + self::theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= self::thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= self::thePageSize, "got to be at least equal in size");
/** capacity.
*/
@@ -148,7 +147,7 @@ struct OStoreIndirectionPageData : public store::OStorePageData
*/
static const size_t theSize = sizeof(G);
static const sal_uInt16 thePageSize = base::theSize + self::theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= self::thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= self::thePageSize, "got to be at least equal in size");
/** capacity.
*/
@@ -573,7 +572,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData
*/
static const size_t theSize = NameBlock::theSize + DataBlock::theSize;
static const sal_uInt16 thePageSize = base::theSize + self::theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= self::thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= self::thePageSize, "got to be at least equal in size");
/** capacity.
*/
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index eca43bae5877..f91d94bd98e3 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/static_assert.hpp"
#include "sal/types.h"
#include "store/types.h"
@@ -123,7 +122,7 @@ struct OStoreBTreeNodeData : public store::OStorePageData
*/
static const size_t theSize = sizeof(G);
static const sal_uInt16 thePageSize = base::theSize + self::theSize;
- BOOST_STATIC_ASSERT(STORE_MINIMUM_PAGESIZE >= self::thePageSize);
+ static_assert(STORE_MINIMUM_PAGESIZE >= self::thePageSize, "got to be at least equal in size");
/** capacity.
*/