From ac9685833caae747abf60389bcfa75adc1f7a969 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 8 Aug 2013 11:43:28 +0100 Subject: [PATCH 1/2] bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index abd4105..3a4036f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.4 +0.2.5 From c6ec0c9c9c9ffbf21a355441ddec265a42203a14 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 8 Aug 2013 15:08:51 +0100 Subject: [PATCH 2/2] Older versions of boost don't have BOOST_STATIC_ASSERT_MSG --- persistent-data/buffer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/persistent-data/buffer.h b/persistent-data/buffer.h index c0540c3..b1a7989 100644 --- a/persistent-data/buffer.h +++ b/persistent-data/buffer.h @@ -44,8 +44,7 @@ namespace persistent_data { template class buffer : private boost::noncopyable { public: - BOOST_STATIC_ASSERT_MSG((Alignment > 1) & !(Alignment & (Alignment - 1)), - "Alignment must be a power of two."); + BOOST_STATIC_ASSERT((Alignment > 1) & !(Alignment & (Alignment - 1))); static uint32_t const ALIGNMENT = Alignment; typedef boost::shared_ptr ptr;