From fe3d0e6c1456da7cd9297f7a75c5584455d8e934 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Thu, 16 Sep 2021 19:16:30 +0300
Subject: [PATCH] Update all references to <system_error> to refer to
 Boost.System

---
 include/boost/system/result.hpp | 13 ++++-----
 test/result_copy_assign.cpp     | 49 ++++++++++++++++-----------------
 test/result_copy_construct.cpp  |  4 +--
 test/result_eq.cpp              |  7 ++---
 test/result_error_access.cpp    | 18 ++++++------
 test/result_error_construct.cpp | 15 +++++-----
 test/result_move_assign.cpp     | 25 ++++++++---------
 test/result_move_construct.cpp  |  4 +--
 test/result_swap.cpp            |  7 ++---
 test/result_value_access.cpp    | 12 ++++----
 10 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/include/boost/system/result.hpp b/include/boost/system/result.hpp
index 52c649a..191d698 100644
--- a/include/boost/system/result.hpp
+++ b/include/boost/system/result.hpp
@@ -5,11 +5,14 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+#include <boost/system/errc.hpp>
+#include <boost/system/system_error.hpp>
+#include <boost/system/detail/error_code.hpp>
+#include <boost/system/detail/error_category_impl.hpp>
 #include <boost/variant2/variant.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <system_error>
 #include <type_traits>
 #include <utility>
 #include <iosfwd>
@@ -21,17 +24,13 @@ namespace boost
 namespace system
 {
 
-class error_code;
-
 // throw_exception_from_error_code
 
-BOOST_NORETURN inline void throw_exception_from_error_code( std::error_code const & e )
+BOOST_NORETURN inline void throw_exception_from_error_code( error_code const & e )
 {
-    boost::throw_exception( std::system_error( e ) );
+    boost::throw_exception( system_error( e ) );
 }
 
-BOOST_NORETURN inline void throw_exception_from_error_code( error_code const & e );
-
 // in_place_*
 
 using in_place_value_t = variant2::in_place_index_t<0>;
diff --git a/test/result_copy_assign.cpp b/test/result_copy_assign.cpp
index 515cbc0..aa1e0d2 100644
--- a/test/result_copy_assign.cpp
+++ b/test/result_copy_assign.cpp
@@ -5,7 +5,6 @@
 #include <boost/system/result.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
-#include <system_error>
 #include <iosfwd>
 #include <cerrno>
 
@@ -91,7 +90,7 @@ int main()
 
     {
         result<int> r;
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -118,7 +117,7 @@ int main()
 
     {
         result<int> const r;
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -159,7 +158,7 @@ int main()
 
     {
         result<X> r;
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -204,7 +203,7 @@ int main()
 
     {
         result<X> const r;
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -239,7 +238,7 @@ int main()
 
     {
         result<int> r( 0 );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -266,7 +265,7 @@ int main()
 
     {
         result<int> const r( 0 );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -307,7 +306,7 @@ int main()
 
     {
         result<X> r( 1 );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -352,7 +351,7 @@ int main()
 
     {
         result<X> const r( 1 );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -368,7 +367,7 @@ int main()
     // error lhs
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2;
@@ -379,7 +378,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2( 1 );
@@ -390,10 +389,10 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -401,7 +400,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
         result<int> r2;
@@ -412,7 +411,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
         result<int> r2( 1 );
@@ -423,10 +422,10 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = r;
 
@@ -436,7 +435,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
         result<X> r2;
@@ -453,7 +452,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
         result<X> r2( 1 );
@@ -470,10 +469,10 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 0 );
 
@@ -487,7 +486,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> const r( ec );
         result<X> r2;
@@ -504,7 +503,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> const r( ec );
         result<X> r2( 1 );
@@ -521,10 +520,10 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> const r( ec );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 0 );
 
diff --git a/test/result_copy_construct.cpp b/test/result_copy_construct.cpp
index 2ce15bd..476b020 100644
--- a/test/result_copy_construct.cpp
+++ b/test/result_copy_construct.cpp
@@ -106,7 +106,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2( r );
@@ -115,7 +115,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
         result<int> r2( r );
diff --git a/test/result_eq.cpp b/test/result_eq.cpp
index b9f9da9..6c03848 100644
--- a/test/result_eq.cpp
+++ b/test/result_eq.cpp
@@ -4,7 +4,6 @@
 
 #include <boost/system/result.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <system_error>
 #include <iosfwd>
 #include <cerrno>
 
@@ -95,8 +94,8 @@ int main()
     }
 
     {
-        result<int> r1( 1, std::generic_category() );
-        result<int> r2( 2, std::generic_category() );
+        result<int> r1( 1, generic_category() );
+        result<int> r2( 2, generic_category() );
 
         BOOST_TEST_EQ( r1, r1 );
         BOOST_TEST_NE( r1, r2 );
@@ -104,7 +103,7 @@ int main()
 
     {
         result<int> r1( 1 );
-        result<int> r2( 2, std::generic_category() );
+        result<int> r2( 2, generic_category() );
 
         BOOST_TEST_EQ( r1, r1 );
         BOOST_TEST_NE( r1, r2 );
diff --git a/test/result_error_access.cpp b/test/result_error_access.cpp
index c103f8a..9d08056 100644
--- a/test/result_error_access.cpp
+++ b/test/result_error_access.cpp
@@ -27,7 +27,7 @@ int main()
         BOOST_TEST( r.has_value() );
         BOOST_TEST( !r.has_error() );
 
-        BOOST_TEST_EQ( r.error(), std::error_code() );
+        BOOST_TEST_EQ( r.error(), error_code() );
     }
 
     {
@@ -36,14 +36,14 @@ int main()
         BOOST_TEST( r.has_value() );
         BOOST_TEST( !r.has_error() );
 
-        BOOST_TEST_EQ( r.error(), std::error_code() );
+        BOOST_TEST_EQ( r.error(), error_code() );
     }
 
     {
         BOOST_TEST( result<int>().has_value() );
         BOOST_TEST( !result<int>().has_error() );
 
-        BOOST_TEST_EQ( result<int>().error(), std::error_code() );
+        BOOST_TEST_EQ( result<int>().error(), error_code() );
     }
 
     {
@@ -52,7 +52,7 @@ int main()
         BOOST_TEST( r.has_value() );
         BOOST_TEST( !r.has_error() );
 
-        BOOST_TEST_EQ( r.error(), std::error_code() );
+        BOOST_TEST_EQ( r.error(), error_code() );
     }
 
     {
@@ -61,18 +61,18 @@ int main()
         BOOST_TEST( r.has_value() );
         BOOST_TEST( !r.has_error() );
 
-        BOOST_TEST_EQ( r.error(), std::error_code() );
+        BOOST_TEST_EQ( r.error(), error_code() );
     }
 
     {
         BOOST_TEST( result<int>( 1 ).has_value() );
         BOOST_TEST( !result<int>( 1 ).has_error() );
 
-        BOOST_TEST_EQ( result<int>( 1 ).error(), std::error_code() );
+        BOOST_TEST_EQ( result<int>( 1 ).error(), error_code() );
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
 
@@ -83,7 +83,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
 
@@ -94,7 +94,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         BOOST_TEST( !result<int>( ec ).has_value() );
         BOOST_TEST( result<int>( ec ).has_error() );
diff --git a/test/result_error_construct.cpp b/test/result_error_construct.cpp
index bb96816..90c66e9 100644
--- a/test/result_error_construct.cpp
+++ b/test/result_error_construct.cpp
@@ -5,7 +5,6 @@
 #include <boost/system/result.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
-#include <system_error>
 #include <string>
 #include <cerrno>
 
@@ -36,7 +35,7 @@ int X::instances = 0;
 int main()
 {
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
 
@@ -47,7 +46,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r = ec;
 
@@ -58,16 +57,16 @@ int main()
     }
 
     {
-        result<int> r( EINVAL, std::generic_category() );
+        result<int> r( EINVAL, generic_category() );
 
         BOOST_TEST( !r.has_value() );
         BOOST_TEST( r.has_error() );
 
-        BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, std::generic_category() ) );
+        BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) );
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<std::error_code> r( in_place_error, ec );
 
@@ -78,12 +77,12 @@ int main()
     }
 
     {
-        result<std::error_code> r( in_place_error, EINVAL, std::generic_category() );
+        result<std::error_code> 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, std::generic_category() ) );
+        BOOST_TEST_EQ( r.error(), std::error_code( EINVAL, generic_category() ) );
     }
 
     BOOST_TEST_EQ( X::instances, 0 );
diff --git a/test/result_move_assign.cpp b/test/result_move_assign.cpp
index d29c0ae..1a7ff72 100644
--- a/test/result_move_assign.cpp
+++ b/test/result_move_assign.cpp
@@ -5,7 +5,6 @@
 #include <boost/system/result.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
-#include <system_error>
 #include <iosfwd>
 #include <cerrno>
 
@@ -115,7 +114,7 @@ int main()
 
     {
         result<int> r;
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = std::move( r );
 
@@ -165,7 +164,7 @@ int main()
 
     {
         result<X> r;
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -213,7 +212,7 @@ int main()
 
     {
         result<int> r( 1 );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = std::move( r );
 
@@ -269,7 +268,7 @@ int main()
 
     {
         result<X> r( 1 );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 1 );
 
@@ -290,7 +289,7 @@ int main()
     // error lhs
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2;
@@ -304,7 +303,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2( 1 );
@@ -318,10 +317,10 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
-        result<int> r2( ENOENT, std::generic_category() );
+        result<int> r2( ENOENT, generic_category() );
 
         r2 = std::move( r );
 
@@ -334,7 +333,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
         result<X> r2;
@@ -354,7 +353,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
         result<X> r2( 1 );
@@ -374,10 +373,10 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<X> r( ec );
-        result<X> r2( ENOENT, std::generic_category() );
+        result<X> r2( ENOENT, generic_category() );
 
         BOOST_TEST_EQ( X::instances, 0 );
 
diff --git a/test/result_move_construct.cpp b/test/result_move_construct.cpp
index 7209019..191e76e 100644
--- a/test/result_move_construct.cpp
+++ b/test/result_move_construct.cpp
@@ -151,7 +151,7 @@ int main()
     BOOST_TEST_EQ( X::instances, 0 );
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
         result<int> r2( std::move( r ) );
@@ -163,7 +163,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r2( result<int>{ ec } );
 
diff --git a/test/result_swap.cpp b/test/result_swap.cpp
index c485e02..1973764 100644
--- a/test/result_swap.cpp
+++ b/test/result_swap.cpp
@@ -4,7 +4,6 @@
 
 #include <boost/system/result.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <system_error>
 #include <iosfwd>
 #include <cerrno>
 
@@ -102,8 +101,8 @@ int main()
     }
 
     {
-        result<int> r1( 1, std::generic_category() ), r1c( r1 );
-        result<int> r2( 2, std::generic_category() ), r2c( r2 );
+        result<int> r1( 1, generic_category() ), r1c( r1 );
+        result<int> r2( 2, generic_category() ), r2c( r2 );
 
         r1.swap( r2 );
 
@@ -118,7 +117,7 @@ int main()
 
     {
         result<int> r1( 1 ), r1c( r1 );
-        result<int> r2( 2, std::generic_category() ), r2c( r2 );
+        result<int> r2( 2, generic_category() ), r2c( r2 );
 
         r1.swap( r2 );
 
diff --git a/test/result_value_access.cpp b/test/result_value_access.cpp
index 95eb248..ddd5fe7 100644
--- a/test/result_value_access.cpp
+++ b/test/result_value_access.cpp
@@ -120,7 +120,7 @@ int main()
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> r( ec );
 
@@ -130,13 +130,13 @@ int main()
         BOOST_TEST_NOT( r );
         BOOST_TEST( !r );
 
-        BOOST_TEST_THROWS( r.value(), std::system_error );
+        BOOST_TEST_THROWS( r.value(), system_error );
 
         BOOST_TEST_EQ( r.operator->(), static_cast<int*>(0) );
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         result<int> const r( ec );
 
@@ -146,13 +146,13 @@ int main()
         BOOST_TEST_NOT( r );
         BOOST_TEST( !r );
 
-        BOOST_TEST_THROWS( r.value(), std::system_error );
+        BOOST_TEST_THROWS( r.value(), system_error );
 
         BOOST_TEST_EQ( r.operator->(), static_cast<int*>(0) );
     }
 
     {
-        auto ec = make_error_code( std::errc::invalid_argument );
+        auto ec = make_error_code( errc::invalid_argument );
 
         BOOST_TEST( !result<int>( ec ).has_value() );
         BOOST_TEST( result<int>( ec ).has_error() );
@@ -160,7 +160,7 @@ int main()
         BOOST_TEST_NOT( result<int>( ec ) );
         BOOST_TEST( !result<int>( ec ) );
 
-        BOOST_TEST_THROWS( result<int>( ec ).value(), std::system_error );
+        BOOST_TEST_THROWS( result<int>( ec ).value(), system_error );
 
         BOOST_TEST_EQ( result<int>( ec ).operator->(), static_cast<int*>(0) );
     }