|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68423 - in trunk: boost libs/utility
From: bdawes_at_[hidden]
Date: 2011-01-24 15:15:41
Author: bemandawes
Date: 2011-01-24 15:15:36 EST (Mon, 24 Jan 2011)
New Revision: 68423
URL: http://svn.boost.org/trac/boost/changeset/68423
Log:
Remove BOOST_ENABLE_ASSERT_MSG_HANDLER; use BOOST_ENABLE_ASSERT_HANDLER in its stead
Text files modified:
trunk/boost/assert.hpp | 2 +-
trunk/libs/utility/assert.html | 4 ++--
trunk/libs/utility/assert_test.cpp | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
Modified: trunk/boost/assert.hpp
==============================================================================
--- trunk/boost/assert.hpp (original)
+++ trunk/boost/assert.hpp 2011-01-24 15:15:36 EST (Mon, 24 Jan 2011)
@@ -61,7 +61,7 @@
#define BOOST_ASSERT_MSG(expr, msg) ((void)0)
-#elif defined(BOOST_ENABLE_ASSERT_MSG_HANDLER)
+#elif defined(BOOST_ENABLE_ASSERT_HANDLER)
#include <boost/current_function.hpp>
Modified: trunk/libs/utility/assert.html
==============================================================================
--- trunk/libs/utility/assert.html (original)
+++ trunk/libs/utility/assert.html 2011-01-24 15:15:36 EST (Mon, 24 Jan 2011)
@@ -66,7 +66,7 @@
<P> <tt>BOOST_ASSERT_MSG(expr, msg)</tt> is equivalent to <code>
((void)0)</code> if <b>BOOST_DISABLE_ASSERTS</b> or <b>NDEBUG</b> are
defined or <code>expr</code> evaluates to <code>true</code>. If those
- macros and <STRONG>BOOST_ENABLE_ASSERT_MSG_HANDLER</STRONG> are not
+ macros and <STRONG>BOOST_ENABLE_ASSERT_HANDLER</STRONG> are not
defined, and <code>expr</code> evaluates to <code>false</code>, an error
message that includes <tt>#expr</tt>, <tt>msg</tt>, <tt> BOOST_CURRENT_FUNCTION</tt>, <tt>
__FILE__</tt>, and <tt>__LINE__</tt> is sent to output stream <b>
@@ -77,7 +77,7 @@
may produce easier to understand output if messages go to a different
stream, such as <code>std::cout</code>. Users may define <b>BOOST_ASSERT_MSG_OSTREAM</b> before including <STRONG><boost/assert.hpp></STRONG>
to specify a different output stream. </P>
- <P>If the macro <STRONG>BOOST_ENABLE_ASSERT_MSG_HANDLER</STRONG> is defined when <STRONG><boost/assert.hpp></STRONG>
+ <P>If the macro <STRONG>BOOST_ENABLE_ASSERT_HANDLER</STRONG> is defined when <STRONG><boost/assert.hpp></STRONG>
is included, instead of sending a error message to an output
stream, this expression is evaluated</P>
<blockquote>
Modified: trunk/libs/utility/assert_test.cpp
==============================================================================
--- trunk/libs/utility/assert_test.cpp (original)
+++ trunk/libs/utility/assert_test.cpp 2011-01-24 15:15:36 EST (Mon, 24 Jan 2011)
@@ -66,7 +66,6 @@
#undef BOOST_DISABLE_ASSERTS
#define BOOST_ENABLE_ASSERT_HANDLER
-#define BOOST_ENABLE_ASSERT_MSG_HANDLER
#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <cstdio>
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