From 4fadd968fa12130524c8380f33fcfe25d4de79e5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 13 Sep 2017 11:24:46 +0900 Subject: Imported Upstream version 1.65.0 Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4 Signed-off-by: DongHun Kwak --- boost/smart_ptr/detail/operator_bool.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'boost/smart_ptr/detail/operator_bool.hpp') diff --git a/boost/smart_ptr/detail/operator_bool.hpp b/boost/smart_ptr/detail/operator_bool.hpp index c0289b870b..f9c5ef6803 100644 --- a/boost/smart_ptr/detail/operator_bool.hpp +++ b/boost/smart_ptr/detail/operator_bool.hpp @@ -9,14 +9,14 @@ #if !defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) && !defined( BOOST_NO_CXX11_NULLPTR )\ && !(defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5130)) - explicit operator bool () const BOOST_NOEXCEPT + explicit operator bool () const BOOST_SP_NOEXCEPT { return px != 0; } #elif ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, < 0x570) ) || defined(__CINT__) - operator bool () const BOOST_NOEXCEPT + operator bool () const BOOST_SP_NOEXCEPT { return px != 0; } @@ -29,7 +29,7 @@ typedef void (*unspecified_bool_type)( this_type*** ); - operator unspecified_bool_type() const BOOST_NOEXCEPT + operator unspecified_bool_type() const BOOST_SP_NOEXCEPT { return px == 0? 0: unspecified_bool; } @@ -41,7 +41,7 @@ typedef element_type * (this_type::*unspecified_bool_type)() const; - operator unspecified_bool_type() const BOOST_NOEXCEPT + operator unspecified_bool_type() const BOOST_SP_NOEXCEPT { return px == 0? 0: &this_type::get; } @@ -50,7 +50,7 @@ typedef element_type * this_type::*unspecified_bool_type; - operator unspecified_bool_type() const BOOST_NOEXCEPT + operator unspecified_bool_type() const BOOST_SP_NOEXCEPT { return px == 0? 0: &this_type::px; } @@ -58,7 +58,7 @@ #endif // operator! is redundant, but some compilers need it - bool operator! () const BOOST_NOEXCEPT + bool operator! () const BOOST_SP_NOEXCEPT { return px == 0; } -- cgit v1.2.3