[Boost-commit] svn:boost r84682 - trunk/boost

Subject: [Boost-commit] svn:boost r84682 - trunk/boost
From: andrey.semashev_at_[hidden]
Date: 2013-06-07 16:21:25

Author: andysem
Date: 2013-06-07 16:21:24 EDT (Fri, 07 Jun 2013)
New Revision: 84682
URL: http://svn.boost.org/trac/boost/changeset/84682

Log:
Optimized BOOST_ASSERT_MSG so that it is more lightweight and doesn't prevent enclosing functions from inlining. Also added branching hints for the checked conditions.

Text files modified: 
   trunk/boost/assert.hpp |    25 +++++++++++++++----------               
   1 files changed, 15 insertions(+), 10 deletions(-)

Modified: trunk/boost/assert.hpp
==============================================================================
--- trunk/boost/assert.hpp	Fri Jun  7 16:10:23 2013	(r84681)
+++ trunk/boost/assert.hpp	2013-06-07 16:21:24 EDT (Fri, 07 Jun 2013)	(r84682)
@@ -34,6 +34,7 @@
 
 #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
 
+#include <boost/config.hpp>
 #include <boost/current_function.hpp>
 
 namespace boost
@@ -42,7 +43,7 @@
                         char const * function, char const * file, long line); // user defined
 } // namespace boost
 
-#define BOOST_ASSERT(expr) ((expr) \
+#define BOOST_ASSERT(expr) (BOOST_LIKELY(!!(expr)) \
   ? ((void)0) \
   : ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
 
@@ -63,6 +64,7 @@
 
 #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
 
+  #include <boost/config.hpp>
   #include <boost/current_function.hpp>
 
   namespace boost
@@ -71,7 +73,7 @@
                               char const * function, char const * file, long line); // user defined
   } // namespace boost
 
-  #define BOOST_ASSERT_MSG(expr, msg) ((expr) \
+  #define BOOST_ASSERT_MSG(expr, msg) (BOOST_LIKELY(!!(expr)) \
     ? ((void)0) \
     : ::boost::assertion_failed_msg(#expr, msg, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
 
@@ -80,6 +82,7 @@
     #define BOOST_ASSERT_HPP
     #include <cstdlib>
     #include <iostream>
+    #include <boost/config.hpp>
     #include <boost/current_function.hpp>
 
     //  IDE's like Visual Studio perform better if output goes to std::cout or
@@ -94,26 +97,28 @@
       {
         namespace detail
         {
-          inline void assertion_failed_msg(char const * expr, char const * msg, char const * function,
+          // Note: The template is needed to make the function non-inline and avoid linking errors
+          template< typename CharT >
+          BOOST_NOINLINE void assertion_failed_msg(CharT const * expr, char const * msg, char const * function,
             char const * file, long line)
           {
             BOOST_ASSERT_MSG_OSTREAM
               << "***** Internal Program Error - assertion (" << expr << ") failed in "
               << function << ":\n"
               << file << '(' << line << "): " << msg << std::endl;
-			#ifdef UNDER_CE
-				// The Windows CE CRT library does not have abort() so use exit(-1) instead.
-				std::exit(-1);
-			#else
-				std::abort();
-			#endif
+#ifdef UNDER_CE
+            // The Windows CE CRT library does not have abort() so use exit(-1) instead.
+            std::exit(-1);
+#else
+            std::abort();
+#endif
           }
         } // detail
       } // assertion
     } // detail
   #endif
 
-  #define BOOST_ASSERT_MSG(expr, msg) ((expr) \
+  #define BOOST_ASSERT_MSG(expr, msg) (BOOST_LIKELY(!!(expr)) \
     ? ((void)0) \
     : ::boost::assertion::detail::assertion_failed_msg(#expr, msg, \
           BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))