Index: boost/assert.hpp
===================================================================
--- boost/assert.hpp	(revision 83430)
+++ boost/assert.hpp	(working copy)
@@ -28,7 +28,7 @@
 
 #undef BOOST_ASSERT
 
-#if defined(BOOST_DISABLE_ASSERTS) || defined(NDEBUG)
+#if defined(BOOST_DISABLE_ASSERTS)
 
 # define BOOST_ASSERT(expr) ((void)0)
 
@@ -57,7 +57,7 @@
 
 # undef BOOST_ASSERT_MSG
 
-#if defined(BOOST_DISABLE_ASSERTS) || defined(NDEBUG)
+#if defined(BOOST_DISABLE_ASSERTS) || ( !defined(BOOST_ENABLE_ASSERT_HANDLER) && defined(NDEBUG) )
 
   #define BOOST_ASSERT_MSG(expr, msg) ((void)0)