Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81812 - sandbox-branches/geometry/index/boost/geometry/extensions/index
From: adam.wulkiewicz_at_[hidden]
Date: 2012-12-09 20:21:00


Author: awulkiew
Date: 2012-12-09 20:21:00 EST (Sun, 09 Dec 2012)
New Revision: 81812
URL: http://svn.boost.org/trac/boost/changeset/81812

Log:
BOOST_ASSERT used instead of std assert
Text files modified:
   sandbox-branches/geometry/index/boost/geometry/extensions/index/assert.hpp | 11 ++++++-----
   1 files changed, 6 insertions(+), 5 deletions(-)

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/assert.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/assert.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/assert.hpp 2012-12-09 20:21:00 EST (Sun, 09 Dec 2012)
@@ -6,21 +6,22 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/assert.hpp>
+
 #ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP
 #define BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP
 
-#ifdef NDEBUG
+#define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG) \
+ BOOST_ASSERT_MSG(CONDITION, TEXT_MSG)
 
-#define BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(PARAM)
+#if defined(BOOST_DISABLE_ASSERTS) || defined(NDEBUG)
 
-#define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG)
+#define BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(PARAM)
 
 #else
 
 #define BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(PARAM) PARAM
 
-#define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG) assert((CONDITION) && (TEXT_MSG))
-
 #endif
 
 #endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk