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

Enable error_code construction from enums specializing std::is_error_code_enum. Fixes #70.

Browse Source
This commit is contained in:
Peter Dimov
2021-10-11 02:02:22 +03:00
parent 5217e58a7d
commit 4ec1e54099
4 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/system/detail/error_code.hpp
View File

@ -107,8 +107,12 @@ public:
} }
template<class ErrorCodeEnum> BOOST_SYSTEM_CONSTEXPR error_code( ErrorCodeEnum e, template<class ErrorCodeEnum> BOOST_SYSTEM_CONSTEXPR error_code( ErrorCodeEnum e,
typename detail::enable_if<is_error_code_enum<ErrorCodeEnum>::value>::type* = 0 ) BOOST_NOEXCEPT: typename detail::enable_if<
d1_(), lc_flags_( 0 ) is_error_code_enum<ErrorCodeEnum>::value
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
|| std::is_error_code_enum<ErrorCodeEnum>::value
#endif
>::type* = 0 ) BOOST_NOEXCEPT: d1_(), lc_flags_( 0 )
{ {
*this = make_error_code( e ); *this = make_error_code( e );
} }

2
test/CMakeLists.txt
View File

@ -110,6 +110,8 @@ boost_test(TYPE run SOURCES ec_location_test2.cpp)
boost_test(TYPE run SOURCES ec_what_test.cpp) boost_test(TYPE run SOURCES ec_what_test.cpp)
boost_test(TYPE run SOURCES system_error_test3.cpp) boost_test(TYPE run SOURCES system_error_test3.cpp)
boost_test(TYPE run SOURCES std_interop_test11.cpp)
# result # result
set(BOOST_TEST_COMPILE_FEATURES cxx_std_11) set(BOOST_TEST_COMPILE_FEATURES cxx_std_11)

2
test/Jamfile.v2
View File

@ -132,6 +132,8 @@ run ec_location_test2.cpp ;
run ec_what_test.cpp ; run ec_what_test.cpp ;
run system_error_test3.cpp ; run system_error_test3.cpp ;
run std_interop_test11.cpp ;
# result # result
import ../../config/checks/config : requires ; import ../../config/checks/config : requires ;

42
test/std_interop_test11.cpp Normal file
View File

@ -0,0 +1,42 @@
// Copyright 2021 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
#include <boost/system/error_code.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/config/pragma_message.hpp>
#include <boost/config.hpp>
#include <cerrno>
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
int main() {}
#else
#include <system_error>
int main()
{
{
boost::system::error_code ec = std::io_errc::stream;
BOOST_TEST( ec == std::io_errc::stream );
BOOST_TEST_NOT( ec != std::io_errc::stream );
ec.clear();
BOOST_TEST_NOT( ec == std::io_errc::stream );
BOOST_TEST( ec != std::io_errc::stream );
ec = std::io_errc::stream;
BOOST_TEST( ec == std::io_errc::stream );
BOOST_TEST_NOT( ec != std::io_errc::stream );
}
return boost::report_errors();
}
#endif