diff --git a/include/boost/current_function.hpp b/include/boost/current_function.hpp
@@ -12,11 +12,11 @@
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
 //
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+//  Distributed under the Boost Software License, Version 1.0.
+//  See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt
 //
-//  http://www.boost.org/libs/utility/current_function.html
+//  http://www.boost.org/libs/assert/current_function.html
 //
 
 namespace boost
@@ -52,6 +52,10 @@ inline void current_function_helper()
 
 # define BOOST_CURRENT_FUNCTION __func__
 
+#elif defined(__cplusplus) && (__cplusplus >= 201103)
+
+# define BOOST_CURRENT_FUNCTION __func__
+
 #else
 
 # define BOOST_CURRENT_FUNCTION "(unknown)"
@@ -65,4 +69,3 @@ inline void current_function_helper()
 } // namespace boost
 
 #endif // #ifndef BOOST_CURRENT_FUNCTION_HPP_INCLUDED
-
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
@@ -14,4 +14,8 @@ test-suite "assert"
         [ run assert_test.cpp ]
         [ run current_function_test.cpp : : : <test-info>always_show_run_output ]
         [ run verify_test.cpp ]
+        [ run assert_exp_test.cpp ]
+        [ run assert_msg_exp_test.cpp ]
+        [ run verify_exp_test.cpp ]
+        [ run verify_msg_exp_test.cpp ]
     ;
diff --git a/test/assert_exp_test.cpp b/test/assert_exp_test.cpp
@@ -0,0 +1,149 @@
+//
+//  assert_exp_test.cpp - tests BOOST_ASSERT expansion
+//
+//  Copyright (c) 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/config.hpp>
+#include <boost/current_function.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <string>
+
+// default case, !NDEBUG
+// BOOST_ASSERT(x) -> assert(x)
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef assert
+
+void test_default()
+{
+    std::string v1 = BOOST_STRINGIZE(BOOST_ASSERT(x1));
+    BOOST_TEST_EQ( v1, "assert(x1)" );
+}
+
+// default case, NDEBUG
+// BOOST_ASSERT(x) -> assert(x)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+#undef assert
+
+void test_default_ndebug()
+{
+    std::string v2 = BOOST_STRINGIZE(BOOST_ASSERT(x2));
+    BOOST_TEST_EQ( v2, "assert(x2)" );
+}
+
+// BOOST_DISABLE_ASSERTS, !NDEBUG
+// BOOST_ASSERT(x) -> ((void)0)
+
+#define BOOST_DISABLE_ASSERTS
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled()
+{
+    std::string v3 = BOOST_STRINGIZE(BOOST_ASSERT(x3));
+    BOOST_TEST_EQ( v3, "((void)0)" );
+}
+
+// BOOST_DISABLE_ASSERTS, NDEBUG
+// BOOST_ASSERT(x) -> ((void)0)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled_ndebug()
+{
+    std::string v4 = BOOST_STRINGIZE(BOOST_ASSERT(x4));
+    BOOST_TEST_EQ( v4, "((void)0)" );
+}
+
+#undef BOOST_DISABLE_ASSERTS
+
+// BOOST_ENABLE_ASSERT_HANDLER, !NDEBUG
+// BOOST_ASSERT(expr) -> (BOOST_LIKELY(!!(expr))? ((void)0): ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
+
+#undef BOOST_LIKELY
+#undef BOOST_CURRENT_FUNCTION
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_handler()
+{
+    std::string v5 = BOOST_STRINGIZE(BOOST_ASSERT(x5)); std::string w5 = "(BOOST_LIKELY(!!(x5))? ((void)0): ::boost::assertion_failed(\"x5\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_handler()";
+    BOOST_TEST_EQ( v5, w5 );
+}
+
+// BOOST_ENABLE_ASSERT_HANDLER, NDEBUG
+// BOOST_ASSERT(expr) -> (BOOST_LIKELY(!!(expr))? ((void)0): ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_handler_ndebug()
+{
+    std::string v6 = BOOST_STRINGIZE(BOOST_ASSERT(x6)); std::string w6 = "(BOOST_LIKELY(!!(x6))? ((void)0): ::boost::assertion_failed(\"x6\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_handler_ndebug()";
+    BOOST_TEST_EQ( v6, w6 );
+}
+
+#undef BOOST_ENABLE_ASSERT_HANDLER
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, !NDEBUG
+// same as BOOST_ENABLE_ASSERT_HANDLER
+
+#define BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler()
+{
+    std::string v7 = BOOST_STRINGIZE(BOOST_ASSERT(x7)); std::string w7 = "(BOOST_LIKELY(!!(x7))? ((void)0): ::boost::assertion_failed(\"x7\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_debug_handler()";
+    BOOST_TEST_EQ( v7, w7 );
+}
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, NDEBUG
+// BOOST_ASSERT(x) -> ((void)0)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler_ndebug()
+{
+    std::string v8 = BOOST_STRINGIZE(BOOST_ASSERT(x8));
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_debug_handler_ndebug()";
+    BOOST_TEST_EQ( v8, "((void)0)" );
+}
+
+#undef BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+int main()
+{
+    test_default();
+    test_default_ndebug();
+    test_disabled();
+    test_disabled_ndebug();
+    test_handler();
+    test_handler_ndebug();
+    test_debug_handler();
+    test_debug_handler_ndebug();
+
+    return boost::report_errors();
+}
diff --git a/test/assert_msg_exp_test.cpp b/test/assert_msg_exp_test.cpp
@@ -0,0 +1,149 @@
+//
+//  assert_msg_exp_test.cpp - tests BOOST_ASSERT_MSG expansion
+//
+//  Copyright (c) 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/config.hpp>
+#include <boost/current_function.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <string>
+
+// default case, !NDEBUG
+// BOOST_ASSERT_MSG(x,"m") -> assert((x)&&("m"))
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef assert
+
+void test_default()
+{
+    std::string v1 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x1, "m1"));
+    BOOST_TEST_EQ( v1, "assert((x1)&&(\"m1\"))" );
+}
+
+// default case, NDEBUG
+// BOOST_ASSERT_MSG(x,"m") -> assert((x)&&("m"))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+#undef assert
+
+void test_default_ndebug()
+{
+    std::string v2 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x2, "m2"));
+    BOOST_TEST_EQ( v2, "assert((x2)&&(\"m2\"))" );
+}
+
+// BOOST_DISABLE_ASSERTS, !NDEBUG
+// BOOST_ASSERT_MSG(x,"m") -> ((void)0)
+
+#define BOOST_DISABLE_ASSERTS
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled()
+{
+    std::string v3 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x3, "m3"));
+    BOOST_TEST_EQ( v3, "((void)0)" );
+}
+
+// BOOST_DISABLE_ASSERTS, NDEBUG
+// BOOST_ASSERT_MSG(x,"m") -> ((void)0)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled_ndebug()
+{
+    std::string v4 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x4, "m4"));
+    BOOST_TEST_EQ( v4, "((void)0)" );
+}
+
+#undef BOOST_DISABLE_ASSERTS
+
+// BOOST_ENABLE_ASSERT_HANDLER, !NDEBUG
+// BOOST_ASSERT_MSG(expr, msg) -> (BOOST_LIKELY(!!(expr))? ((void)0): ::boost::assertion_failed_msg(#expr, msg, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
+
+#undef BOOST_LIKELY
+#undef BOOST_CURRENT_FUNCTION
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_handler()
+{
+    std::string v5 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x5, "m5")); std::string w5 = "(BOOST_LIKELY(!!(x5))? ((void)0): ::boost::assertion_failed_msg(\"x5\", \"m5\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_handler()";
+    BOOST_TEST_EQ( v5, w5 );
+}
+
+// BOOST_ENABLE_ASSERT_HANDLER, NDEBUG
+// BOOST_ASSERT_MSG(expr, msg) -> (BOOST_LIKELY(!!(expr))? ((void)0): ::boost::assertion_failed_msg(#expr, msg, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_handler_ndebug()
+{
+    std::string v6 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x6, "m6")); std::string w6 = "(BOOST_LIKELY(!!(x6))? ((void)0): ::boost::assertion_failed_msg(\"x6\", \"m6\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_handler_ndebug()";
+    BOOST_TEST_EQ( v6, w6 );
+}
+
+#undef BOOST_ENABLE_ASSERT_HANDLER
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, !NDEBUG
+// same as BOOST_ENABLE_ASSERT_HANDLER
+
+#define BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler()
+{
+    std::string v7 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x7, "m7")); std::string w7 = "(BOOST_LIKELY(!!(x7))? ((void)0): ::boost::assertion_failed_msg(\"x7\", \"m7\", BOOST_CURRENT_FUNCTION, \"" __FILE__ "\", " BOOST_STRINGIZE(__LINE__) "))";
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_debug_handler()";
+    BOOST_TEST_EQ( v7, w7 );
+}
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, NDEBUG
+// BOOST_ASSERT_MSG(x,"m") -> ((void)0)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler_ndebug()
+{
+    std::string v8 = BOOST_STRINGIZE(BOOST_ASSERT_MSG(x8, "m8"));
+
+    char const * BOOST_CURRENT_FUNCTION = "void test_debug_handler_ndebug()";
+    BOOST_TEST_EQ( v8, "((void)0)" );
+}
+
+#undef BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+int main()
+{
+    test_default();
+    test_default_ndebug();
+    test_disabled();
+    test_disabled_ndebug();
+    test_handler();
+    test_handler_ndebug();
+    test_debug_handler();
+    test_debug_handler_ndebug();
+
+    return boost::report_errors();
+}
diff --git a/test/verify_exp_test.cpp b/test/verify_exp_test.cpp
@@ -0,0 +1,136 @@
+//
+//  verify_exp_test.cpp - tests BOOST_ASSERT expansion
+//
+//  Copyright (c) 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/config.hpp>
+#include <boost/current_function.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <string>
+
+// default case, !NDEBUG
+// BOOST_VERIFY(x) -> BOOST_ASSERT(x)
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT
+
+void test_default()
+{
+    std::string v1 = BOOST_STRINGIZE(BOOST_VERIFY(x1));
+    BOOST_TEST_EQ( v1, "BOOST_ASSERT(x1)" );
+}
+
+// default case, NDEBUG
+// BOOST_VERIFY(x) -> ((void)(x))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_default_ndebug()
+{
+    std::string v2 = BOOST_STRINGIZE(BOOST_VERIFY(x2));
+    BOOST_TEST_EQ( v2, "((void)(x2))" );
+}
+
+// BOOST_DISABLE_ASSERTS, !NDEBUG
+// BOOST_VERIFY(x) -> ((void)(x))
+
+#define BOOST_DISABLE_ASSERTS
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled()
+{
+    std::string v3 = BOOST_STRINGIZE(BOOST_VERIFY(x3));
+    BOOST_TEST_EQ( v3, "((void)(x3))" );
+}
+
+// BOOST_DISABLE_ASSERTS, NDEBUG
+// BOOST_VERIFY(x) -> ((void)(x))
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled_ndebug()
+{
+    std::string v4 = BOOST_STRINGIZE(BOOST_VERIFY(x4));
+    BOOST_TEST_EQ( v4, "((void)(x4))" );
+}
+
+#undef BOOST_DISABLE_ASSERTS
+
+// BOOST_ENABLE_ASSERT_HANDLER, !NDEBUG
+// BOOST_VERIFY(x) -> BOOST_ASSERT(x)
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT
+
+void test_handler()
+{
+    std::string v5 = BOOST_STRINGIZE(BOOST_VERIFY(x5));
+    BOOST_TEST_EQ( v5, "BOOST_ASSERT(x5)" );
+}
+
+#define NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT
+
+void test_handler_ndebug()
+{
+    std::string v6 = BOOST_STRINGIZE(BOOST_VERIFY(x6));
+    BOOST_TEST_EQ( v6, "BOOST_ASSERT(x6)" );
+}
+
+#undef BOOST_ENABLE_ASSERT_HANDLER
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, !NDEBUG
+// BOOST_VERIFY(x) -> BOOST_ASSERT(x)
+
+#define BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT
+
+void test_debug_handler()
+{
+    std::string v7 = BOOST_STRINGIZE(BOOST_VERIFY(x7));
+    BOOST_TEST_EQ( v7, "BOOST_ASSERT(x7)" );
+}
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, NDEBUG
+// BOOST_VERIFY(x) -> ((void)(x))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler_ndebug()
+{
+    std::string v8 = BOOST_STRINGIZE(BOOST_VERIFY(x8));
+    BOOST_TEST_EQ( v8, "((void)(x8))" );
+}
+
+#undef BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+int main()
+{
+    test_default();
+    test_default_ndebug();
+    test_disabled();
+    test_disabled_ndebug();
+    test_handler();
+    test_handler_ndebug();
+    test_debug_handler();
+    test_debug_handler_ndebug();
+
+    return boost::report_errors();
+}
diff --git a/test/verify_msg_exp_test.cpp b/test/verify_msg_exp_test.cpp
@@ -0,0 +1,140 @@
+//
+//  verify_msg_exp_test.cpp - tests BOOST_VERIFY_MSG expansion
+//
+//  Copyright (c) 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/config.hpp>
+#include <boost/current_function.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <string>
+
+// default case, !NDEBUG
+// BOOST_VERIFY_MSG(x,"m") -> BOOST_ASSERT_MSG(x,"m")
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT_MSG
+
+void test_default()
+{
+    std::string v1 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x1, m1));
+    BOOST_TEST_EQ( v1, "BOOST_ASSERT_MSG(x1,m1)" );
+}
+
+// default case, NDEBUG
+// BOOST_VERIFY_MSG(x,"m") -> ((void)(x))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_default_ndebug()
+{
+    std::string v2 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x2, m2));
+    BOOST_TEST_EQ( v2, "((void)(x2))" );
+}
+
+// BOOST_DISABLE_ASSERTS, !NDEBUG
+// BOOST_VERIFY_MSG(x,"m") -> ((void)(x))
+
+#define BOOST_DISABLE_ASSERTS
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled()
+{
+    std::string v3 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x3, "m3"));
+    BOOST_TEST_EQ( v3, "((void)(x3))" );
+}
+
+// BOOST_DISABLE_ASSERTS, NDEBUG
+// BOOST_VERIFY_MSG(x,"m") -> ((void)(x))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_disabled_ndebug()
+{
+    std::string v4 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x4, "m4"));
+    BOOST_TEST_EQ( v4, "((void)(x4))" );
+}
+
+#undef BOOST_DISABLE_ASSERTS
+
+// BOOST_ENABLE_ASSERT_HANDLER, !NDEBUG
+// BOOST_VERIFY_MSG(x,m) -> BOOST_ASSERT_MSG(x,m)
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT_MSG
+
+void test_handler()
+{
+    std::string v5 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x5, m5));
+    BOOST_TEST_EQ( v5, "BOOST_ASSERT_MSG(x5,m5)" );
+}
+
+// BOOST_ENABLE_ASSERT_HANDLER, NDEBUG
+// BOOST_VERIFY_MSG(x,n) -> BOOST_ASSERT_MSG(x,m)
+
+#define NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT_MSG
+
+void test_handler_ndebug()
+{
+    std::string v6 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x6, m6));
+    BOOST_TEST_EQ( v6, "BOOST_ASSERT_MSG(x6,m6)" );
+}
+
+#undef BOOST_ENABLE_ASSERT_HANDLER
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, !NDEBUG
+// BOOST_VERIFY_MSG(x,n) -> BOOST_ASSERT_MSG(x,m)
+
+#define BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+#undef NDEBUG
+#include <boost/assert.hpp>
+#undef BOOST_ASSERT_MSG
+
+void test_debug_handler()
+{
+    std::string v7 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x7, m7));
+    BOOST_TEST_EQ( v7, "BOOST_ASSERT_MSG(x7,m7)" );
+}
+
+// BOOST_ENABLE_ASSERT_DEBUG_HANDLER, NDEBUG
+// BOOST_VERIFY_MSG(x,"m") -> ((void)(x))
+
+#define NDEBUG
+#include <boost/assert.hpp>
+
+void test_debug_handler_ndebug()
+{
+    std::string v8 = BOOST_STRINGIZE(BOOST_VERIFY_MSG(x8, "m8"));
+    BOOST_TEST_EQ( v8, "((void)(x8))" );
+}
+
+#undef BOOST_ENABLE_ASSERT_DEBUG_HANDLER
+
+int main()
+{
+    test_default();
+    test_default_ndebug();
+    test_disabled();
+    test_disabled_ndebug();
+    test_handler();
+    test_handler_ndebug();
+    test_debug_handler();
+    test_debug_handler_ndebug();
+
+    return boost::report_errors();
+}