boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 12:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert operator bool() to its pre-failed value() != 0 meaning"

Browse Source 
This reverts commit 3164b387a5.
This commit is contained in:
Peter Dimov
2020-06-16 20:24:23 +03:00
parent 6942dc454b
commit 5d3365717e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/system/reference.adoc
View File

@ -626,7 +626,7 @@ constexpr explicit operator bool() const noexcept;
[none] [none]
* {blank} * {blank}
+ +
Returns: :: `val_ != 0`. Returns: :: `failed()`.
``` ```
operator std::error_code() const; operator std::error_code() const;
@ -789,7 +789,7 @@ constexpr explicit operator bool() const noexcept;
[none] [none]
* {blank} * {blank}
+ +
Returns: :: `val_ != 0`. Returns: :: `failed()`.
``` ```
operator std::error_condition() const; operator std::error_condition() const;

12
include/boost/system/error_code.hpp
View File

@ -515,7 +515,7 @@ public:
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 val_ != 0; return failed_;
} }
#else #else
@ -525,12 +525,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 val_ != 0? unspecified_bool_true: 0; return failed_? 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 val_ == 0; return !failed_;
} }
#endif #endif
@ -656,7 +656,7 @@ public:
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 val_ != 0; return failed_;
} }
#else #else
@ -666,12 +666,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 val_ != 0? unspecified_bool_true: 0; return failed_? 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 val_ == 0; return !failed_;
} }
#endif #endif

6
test/failed_test.cpp
View File

@ -123,13 +123,13 @@ template<class Ec> void test()
{ {
Ec ec( 0, http_category() ); Ec ec( 0, http_category() );
BOOST_TEST( ec.failed() ); TEST_FAILED( ec );
ec.assign( 200, http_category() ); ec.assign( 200, http_category() );
BOOST_TEST( !ec.failed() ); TEST_NOT_FAILED( ec );
ec = Ec( 404, http_category() ); ec = Ec( 404, http_category() );
BOOST_TEST( ec.failed() ); TEST_FAILED( ec );
} }
} }