boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
[SVN r84682]
This commit is contained in:
Andrey Semashev 2013-06-07 20:21:24 +00:00
parent 6bb1ce9b7b
commit 9baf33dd16
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/assert.hpp
View File

@ -34,6 +34,7 @@
#elif defined(BOOST_ENABLE_ASSERT_HANDLER) #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
#include <boost/config.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
namespace boost namespace boost
@ -42,7 +43,7 @@ namespace boost
char const * function, char const * file, long line); // user defined char const * function, char const * file, long line); // user defined
} // namespace boost } // namespace boost
#define BOOST_ASSERT(expr) ((expr) \ #define BOOST_ASSERT(expr) (BOOST_LIKELY(!!(expr)) \
? ((void)0) \ ? ((void)0) \
: ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)) : ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
@ -63,6 +64,7 @@ namespace boost
#elif defined(BOOST_ENABLE_ASSERT_HANDLER) #elif defined(BOOST_ENABLE_ASSERT_HANDLER)
#include <boost/config.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
namespace boost namespace boost
@ -71,7 +73,7 @@ namespace boost
char const * function, char const * file, long line); // user defined char const * function, char const * file, long line); // user defined
} // namespace boost } // namespace boost
#define BOOST_ASSERT_MSG(expr, msg) ((expr) \ #define BOOST_ASSERT_MSG(expr, msg) (BOOST_LIKELY(!!(expr)) \
? ((void)0) \ ? ((void)0) \
: ::boost::assertion_failed_msg(#expr, msg, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)) : ::boost::assertion_failed_msg(#expr, msg, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
@ -80,6 +82,7 @@ namespace boost
#define BOOST_ASSERT_HPP #define BOOST_ASSERT_HPP
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <boost/config.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
// IDE's like Visual Studio perform better if output goes to std::cout or // IDE's like Visual Studio perform better if output goes to std::cout or
@ -94,26 +97,28 @@ namespace boost
{ {
namespace detail 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) char const * file, long line)
{ {
BOOST_ASSERT_MSG_OSTREAM BOOST_ASSERT_MSG_OSTREAM
<< "***** Internal Program Error - assertion (" << expr << ") failed in " << "***** Internal Program Error - assertion (" << expr << ") failed in "
<< function << ":\n" << function << ":\n"
<< file << '(' << line << "): " << msg << std::endl; << file << '(' << line << "): " << msg << std::endl;
#ifdef UNDER_CE #ifdef UNDER_CE
// The Windows CE CRT library does not have abort() so use exit(-1) instead. // The Windows CE CRT library does not have abort() so use exit(-1) instead.
std::exit(-1); std::exit(-1);
#else #else
std::abort(); std::abort();
#endif #endif
} }
} // detail } // detail
} // assertion } // assertion
} // detail } // detail
#endif #endif
#define BOOST_ASSERT_MSG(expr, msg) ((expr) \ #define BOOST_ASSERT_MSG(expr, msg) (BOOST_LIKELY(!!(expr)) \
? ((void)0) \ ? ((void)0) \
: ::boost::assertion::detail::assertion_failed_msg(#expr, msg, \ : ::boost::assertion::detail::assertion_failed_msg(#expr, msg, \
BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)) BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))