From 3279399fe32f2ecc5bdd3b80c5792212e308d797 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Mon, 24 Jan 2011 20:15:36 +0000
Subject: [PATCH] Remove BOOST_ENABLE_ASSERT_MSG_HANDLER; use
 BOOST_ENABLE_ASSERT_HANDLER in its stead

[SVN r68423]
---
 assert.html              | 4 ++--
 assert_test.cpp          | 1 -
 include/boost/assert.hpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assert.html b/assert.html
index aa3cbf2..5f3f6e7 100644
--- a/assert.html
+++ b/assert.html
@@ -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> <a href="current_function.html">BOOST_CURRENT_FUNCTION</a></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>&lt;boost/assert.hpp&gt;</STRONG> 
         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 
         stream, this expression is evaluated</P>
 		<blockquote>
diff --git a/assert_test.cpp b/assert_test.cpp
index a0e1e04..26051ac 100644
--- a/assert_test.cpp
+++ b/assert_test.cpp
@@ -66,7 +66,6 @@ void test_disabled()
 #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>
diff --git a/include/boost/assert.hpp b/include/boost/assert.hpp
index a04e2e4..174f084 100644
--- a/include/boost/assert.hpp
+++ b/include/boost/assert.hpp
@@ -61,7 +61,7 @@ namespace boost
 
   #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>