From 65da7dfd56f1de54c17ca5e2ffff6ee8d6861ac6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 22 Apr 2022 19:52:19 +0300 Subject: [PATCH] Update result_error_construct tests to use sys::error_code instead of (erroneously) std::error_code --- test/result_error_construct.cpp | 14 +++++++------- test/result_error_construct2.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/result_error_construct.cpp b/test/result_error_construct.cpp index 8ea5f70..8cee5a9 100644 --- a/test/result_error_construct.cpp +++ b/test/result_error_construct.cpp @@ -62,13 +62,13 @@ int main() BOOST_TEST( !r.has_value() ); BOOST_TEST( r.has_error() ); - BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) ); + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); } { auto ec = make_error_code( errc::invalid_argument ); - result r( in_place_error, ec ); + result r( in_place_error, ec ); BOOST_TEST( !r.has_value() ); BOOST_TEST( r.has_error() ); @@ -77,12 +77,12 @@ int main() } { - result r( in_place_error, EINVAL, generic_category() ); + result r( in_place_error, EINVAL, generic_category() ); BOOST_TEST( !r.has_value() ); BOOST_TEST( r.has_error() ); - BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) ); + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); } BOOST_TEST_EQ( X::instances, 0 ); @@ -140,8 +140,8 @@ int main() BOOST_TEST_EQ( X::instances, 0 ); { - BOOST_TEST_TRAIT_TRUE((std::is_constructible, std::error_code>)); - BOOST_TEST_TRAIT_TRUE((std::is_convertible>)); + BOOST_TEST_TRAIT_TRUE((std::is_constructible, error_code>)); + BOOST_TEST_TRAIT_TRUE((std::is_convertible>)); BOOST_TEST_TRAIT_TRUE((std::is_constructible, int>)); BOOST_TEST_TRAIT_FALSE((std::is_convertible>)); @@ -178,7 +178,7 @@ int main() BOOST_TEST( !r.has_value() ); BOOST_TEST( r.has_error() ); - BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) ); + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); } return boost::report_errors(); diff --git a/test/result_error_construct2.cpp b/test/result_error_construct2.cpp index cf1aeff..71886ab 100644 --- a/test/result_error_construct2.cpp +++ b/test/result_error_construct2.cpp @@ -41,7 +41,7 @@ int main() BOOST_TEST( !r.has_value() ); BOOST_TEST( r.has_error() ); - BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) ); + BOOST_TEST_EQ( r.error(), error_code( EINVAL, generic_category() ) ); } {