From f504e95d1024e07754164a26feabfe06e2cc7aa2 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 18:07:19 +0000
Subject: [PATCH] Full merge from trunk at revision 41356 of entire boost-root
 tree.

[SVN r41369]
---
 include/boost/assert.hpp           | 13 +++++++++++++
 include/boost/current_function.hpp |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/include/boost/assert.hpp b/include/boost/assert.hpp
index 5619f29..c227f17 100644
--- a/include/boost/assert.hpp
+++ b/include/boost/assert.hpp
@@ -2,6 +2,7 @@
 //  boost/assert.hpp - BOOST_ASSERT(expr)
 //
 //  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+//  Copyright (c) 2007 Peter Dimov
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -35,3 +36,15 @@ void assertion_failed(char const * expr, char const * function, char const * fil
 # include <assert.h> // .h to support old libraries w/o <cassert> - effect is the same
 # define BOOST_ASSERT(expr) assert(expr)
 #endif
+
+#undef BOOST_VERIFY
+
+#if defined(BOOST_DISABLE_ASSERTS) || ( !defined(BOOST_ENABLE_ASSERT_HANDLER) && defined(NDEBUG) )
+
+# define BOOST_VERIFY(expr) ((void)(expr))
+
+#else
+
+# define BOOST_VERIFY(expr) BOOST_ASSERT(expr)
+
+#endif
diff --git a/include/boost/current_function.hpp b/include/boost/current_function.hpp
index 40e3abd..aa5756e 100644
--- a/include/boost/current_function.hpp
+++ b/include/boost/current_function.hpp
@@ -32,6 +32,10 @@ inline void current_function_helper()
 
 # define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__
 
+#elif defined(__DMC__) && (__DMC__ >= 0x810)
+
+# define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__
+
 #elif defined(__FUNCSIG__)
 
 # define BOOST_CURRENT_FUNCTION __FUNCSIG__