feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Mark error_condition::failed, error_condition::message as deprecated; revert op bool

Browse Source
This commit is contained in:
Peter Dimov
2020-10-06 04:03:13 +03:00
parent 6758690d2f
commit 329e72fb92
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/boost/system/detail/error_condition.hpp
View File

@ -32,7 +32,6 @@ class error_condition
private: private:
int val_; int val_;
bool failed_;
error_category const * cat_; error_category const * cat_;
public: public:
@ -40,12 +39,12 @@ public:
// constructors: // constructors:
BOOST_SYSTEM_CONSTEXPR error_condition() BOOST_NOEXCEPT: BOOST_SYSTEM_CONSTEXPR error_condition() BOOST_NOEXCEPT:
val_( 0 ), failed_( false ), cat_( &generic_category() ) val_( 0 ), cat_( &generic_category() )
{ {
} }
BOOST_SYSTEM_CONSTEXPR error_condition( int val, const error_category & cat ) BOOST_NOEXCEPT: BOOST_SYSTEM_CONSTEXPR error_condition( int val, const error_category & cat ) BOOST_NOEXCEPT:
val_( val ), failed_( detail::failed_impl( val, cat ) ), cat_( &cat ) val_( val ), cat_( &cat )
{ {
} }
@ -60,7 +59,6 @@ public:
BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) BOOST_NOEXCEPT BOOST_SYSTEM_CONSTEXPR void assign( int val, const error_category & cat ) BOOST_NOEXCEPT
{ {
val_ = val; val_ = val;
failed_ = detail::failed_impl( val, cat );
cat_ = &cat; cat_ = &cat;
} }
@ -75,7 +73,6 @@ public:
BOOST_SYSTEM_CONSTEXPR void clear() BOOST_NOEXCEPT BOOST_SYSTEM_CONSTEXPR void clear() BOOST_NOEXCEPT
{ {
val_ = 0; val_ = 0;
failed_ = false;
cat_ = &generic_category(); cat_ = &generic_category();
} }
@ -96,21 +93,21 @@ public:
return cat_->message( value() ); return cat_->message( value() );
} }
char const * message( char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_SYSTEM_DEPRECATED("this function is slated for removal") char const * message( char * buffer, std::size_t len ) const BOOST_NOEXCEPT
{ {
return cat_->message( value(), buffer, len ); return cat_->message( value(), buffer, len );
} }
BOOST_SYSTEM_CONSTEXPR bool failed() const BOOST_NOEXCEPT BOOST_SYSTEM_DEPRECATED("this function is slated for removal") BOOST_SYSTEM_CONSTEXPR bool failed() const BOOST_NOEXCEPT
{ {
return failed_; return detail::failed_impl( val_, *cat_ );
} }
#if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) #if !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT // true if error BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT // true if error
{ {
return failed_; return val_ != 0;
} }
#else #else
@ -120,12 +117,12 @@ public:
BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const BOOST_NOEXCEPT // true if error BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const BOOST_NOEXCEPT // true if error
{ {
return failed_? unspecified_bool_true: 0; return val_ != 0? unspecified_bool_true: 0;
} }
BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT // true if no error BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT // true if no error
{ {
return !failed_; return val_ == 0;
} }
#endif #endif

30
test/failed_test.cpp
View File

@ -120,18 +120,30 @@ template<class Ec> void test()
ec.assign( 0, generic_category() ); ec.assign( 0, generic_category() );
TEST_NOT_FAILED( ec ); TEST_NOT_FAILED( ec );
} }
}
{ template<class Ec> void test2()
Ec ec( 0, http_category() ); {
TEST_FAILED( ec ); Ec ec( 0, http_category() );
TEST_FAILED( ec );
ec.assign( 200, http_category() ); ec.assign( 200, http_category() );
TEST_NOT_FAILED( ec ); TEST_NOT_FAILED( ec );
ec = Ec( 404, http_category() ); ec = Ec( 404, http_category() );
TEST_FAILED( ec ); TEST_FAILED( ec );
} }
template<class Ec> void test3()
{
Ec ec( 0, http_category() );
BOOST_TEST( ec.failed() );
ec.assign( 200, http_category() );
BOOST_TEST( !ec.failed() );
ec = Ec( 404, http_category() );
BOOST_TEST( ec.failed() );
} }
int main() int main()
@ -147,7 +159,9 @@ int main()
BOOST_TEST( http_category().failed( 404 ) ); BOOST_TEST( http_category().failed( 404 ) );
test<error_code>(); test<error_code>();
test2<error_code>();
test<error_condition>(); test<error_condition>();
test3<error_condition>();
{ {
error_condition ec( errc::success ); error_condition ec( errc::success );