Merge branch 'develop'

Conflicts:
	include/boost/utility/explicit_operator_bool.hpp
This commit is contained in:
Andrey Semashev committed 2014-06-01 22:11:09 +04:00
commit c2785cc598
1 file changed
+1 -1
@@ -134,7 +134,7 @@ namespace detail {
return !this->operator! ();\
}
#define BOOST_EXPLICIT_OPERATOR_BOOL()\
#define BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()\
BOOST_FORCEINLINE operator bool () const BOOST_NOEXCEPT\
{\
return !this->operator! ();\