Remove BOOST_ENABLE_ASSERT_MSG_HANDLER; use BOOST_ENABLE_ASSERT_HANDLER in its stead

[SVN r68423]
This commit is contained in:
Beman Dawes 2011-01-24 20:15:36 +00:00
parent 87875cadda
commit 3279399fe3
3 changed files with 3 additions and 4 deletions

View File

@ -66,7 +66,7 @@
<P> <tt>BOOST_ASSERT_MSG(expr, msg)</tt> is equivalent to <code> <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 ((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 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 defined, and <code>expr</code> evaluates to <code>false</code>, an error
message that includes <tt>#expr</tt>, <tt>msg</tt>, <tt> <a href="current_function.html">BOOST_CURRENT_FUNCTION</a></tt>, <tt> message that includes <tt>#expr</tt>, <tt>msg</tt>, <tt> <a href="current_function.html">BOOST_CURRENT_FUNCTION</a></tt>, <tt>
__FILE__</tt>, and <tt>__LINE__</tt> is sent to output stream <b> __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 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>&lt;boost/assert.hpp&gt;</STRONG> stream, such as <code>std::cout</code>. Users may define <b>BOOST_ASSERT_MSG_OSTREAM</b> before including <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
to specify a different output stream.&nbsp; </P> to specify a different output stream.&nbsp; </P>
<P>If the macro <STRONG>BOOST_ENABLE_ASSERT_MSG_HANDLER</STRONG> is defined when <STRONG>&lt;boost/assert.hpp&gt;</STRONG> <P>If the macro <STRONG>BOOST_ENABLE_ASSERT_HANDLER</STRONG> is defined when <STRONG>&lt;boost/assert.hpp&gt;</STRONG>
is included, instead of sending a error message to an output is included, instead of sending a error message to an output
stream, this expression is evaluated</P> stream, this expression is evaluated</P>
<blockquote> <blockquote>

View File

@ -66,7 +66,6 @@ void test_disabled()
#undef BOOST_DISABLE_ASSERTS #undef BOOST_DISABLE_ASSERTS
#define BOOST_ENABLE_ASSERT_HANDLER #define BOOST_ENABLE_ASSERT_HANDLER
#define BOOST_ENABLE_ASSERT_MSG_HANDLER
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <cstdio> #include <cstdio>

View File

@ -61,7 +61,7 @@ namespace boost
#define BOOST_ASSERT_MSG(expr, msg) ((void)0) #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> #include <boost/current_function.hpp>