deprecate type aliases

Author: grisumbras

bench/bench.cpp

@@ -298,7 +298,7 @@ class boost_default_impl : public any_impl
         while(repeat--)
         {
             p.reset();
-            error_code ec;
+            system::error_code ec;
             p.write(s.data(), s.size(), ec);
             if(! ec)
                 p.finish(ec);
@@ -320,7 +320,7 @@ class boost_default_impl : public any_impl
 
             FILE* f = fopen(fi.name.data(), "rb");
 
-            error_code ec;
+            system::error_code ec;
             while( true )
             {
                 std::size_t const sz = fread(s, 1, sizeof(s), f);
@@ -412,7 +412,7 @@ class boost_pool_impl : public any_impl
         {
             monotonic_resource mr;
             p.reset(&mr);
-            error_code ec;
+            system::error_code ec;
             p.write(s.data(), s.size(), ec);
             if(! ec)
                 p.finish(ec);
@@ -435,7 +435,7 @@ class boost_pool_impl : public any_impl
 
             FILE* f = fopen(fi.name.data(), "rb");
 
-            error_code ec;
+            system::error_code ec;
             while( true )
             {
                 std::size_t const sz = fread(s, 1, sizeof(s), f);
@@ -509,24 +509,24 @@ class boost_null_impl : public any_impl
             constexpr static std::size_t max_key_size = std::size_t(-1);
             constexpr static std::size_t max_string_size = std::size_t(-1);
 
-            bool on_document_begin(error_code&) { return true; }
-            bool on_document_end(error_code&) { return true; }
-            bool on_object_begin(error_code&) { return true; }
-            bool on_object_end(std::size_t, error_code&) { return true; }
-            bool on_array_begin(error_code&) { return true; }
-            bool on_array_end(std::size_t, error_code&) { return true; }
-            bool on_key_part(string_view, std::size_t, error_code&) { return true; }
-            bool on_key( string_view, std::size_t, error_code&) { return true; }
-            bool on_string_part(string_view, std::size_t, error_code&) { return true; }
-            bool on_string(string_view, std::size_t, error_code&) { return true; }
-            bool on_number_part(string_view, error_code&) { return true; }
-            bool on_int64(std::int64_t, string_view, error_code&) { return true; }
-            bool on_uint64(std::uint64_t, string_view, error_code&) { return true; }
-            bool on_double(double, string_view, error_code&) { return true; }
-            bool on_bool(bool, error_code&) { return true; }
-            bool on_null(error_code&) { return true; }
-            bool on_comment_part(string_view, error_code&) { return true; }
-            bool on_comment(string_view, error_code&) { return true; }
+            bool on_document_begin(system::error_code&) { return true; }
+            bool on_document_end(system::error_code&) { return true; }
+            bool on_object_begin(system::error_code&) { return true; }
+            bool on_object_end(std::size_t, system::error_code&) { return true; }
+            bool on_array_begin(system::error_code&) { return true; }
+            bool on_array_end(std::size_t, system::error_code&) { return true; }
+            bool on_key_part(string_view, std::size_t, system::error_code&) { return true; }
+            bool on_key( string_view, std::size_t, system::error_code&) { return true; }
+            bool on_string_part(string_view, std::size_t, system::error_code&) { return true; }
+            bool on_string(string_view, std::size_t, system::error_code&) { return true; }
+            bool on_number_part(string_view, system::error_code&) { return true; }
+            bool on_int64(std::int64_t, string_view, system::error_code&) { return true; }
+            bool on_uint64(std::uint64_t, string_view, system::error_code&) { return true; }
+            bool on_double(double, string_view, system::error_code&) { return true; }
+            bool on_bool(bool, system::error_code&) { return true; }
+            bool on_null(system::error_code&) { return true; }
+            bool on_comment_part(string_view, system::error_code&) { return true; }
+            bool on_comment(string_view, system::error_code&) { return true; }
         };
 
         basic_parser<handler> p_;
@@ -546,7 +546,7 @@ class boost_null_impl : public any_impl
         write(
             char const* data,
             std::size_t size,
-            error_code& ec)
+            system::error_code& ec)
         {
             auto const n = p_.write_some(
                 false, data, size, ec);
@@ -559,14 +559,14 @@ class boost_null_impl : public any_impl
         write_some(
             char const* data,
             std::size_t size,
-            error_code& ec)
+            system::error_code& ec)
         {
             return p_.write_some(
                 true, data, size, ec);
         }
 
         void
-        finish(error_code& ec)
+        finish(system::error_code& ec)
         {
             p_.write_some(false, nullptr, 0, ec);
         }
@@ -599,7 +599,7 @@ class boost_null_impl : public any_impl
         while(repeat--)
         {
             p.reset();
-            error_code ec;
+            system::error_code ec;
             p.write(s.data(), s.size(), ec);
             BOOST_ASSERT(! ec);
         }
@@ -618,7 +618,7 @@ class boost_null_impl : public any_impl
 
             FILE* f = fopen(fi.name.data(), "rb");
 
-            error_code ec;
+            system::error_code ec;
             while( true )
             {
                 std::size_t const sz = fread(s, 1, sizeof(s), f);
@@ -679,7 +679,7 @@ class boost_simple_impl : public any_impl
         auto const start = clock_type::now();
         while(repeat--)
         {
-            error_code ec;
+            system::error_code ec;
             monotonic_resource mr;
             auto jv = json::parse(s, ec, &mr, popts);
             (void)jv;
@@ -693,7 +693,7 @@ class boost_simple_impl : public any_impl
         auto const start = clock_type::now();
         while(repeat--)
         {
-            error_code ec;
+            system::error_code ec;
             std::ifstream is( fi.name, std::ios::in | std::ios::binary );
             monotonic_resource mr;
             auto jv = json::parse(is, ec, &mr, popts);
@@ -1188,7 +1188,7 @@ main(
 
         dout << "\n" << strout.str();
     }
-    catch(system_error const& se)
+    catch(boost::system::system_error const& se)
     {
         dout << se.what() << std::endl;
     }

doc/qbk/allocators/background.qbk

@@ -39,12 +39,12 @@ definitions must be visible at all call sites.
 [heading Polymorphic Allocators]
 
 C++17 improves the allocator model by representing the low-level
-allocation operation with an abstract interface called __memory_resource__,
+allocation operation with an abstract interface called `memory_resource`,
 which is not parameterized on the element type, and has no traits:
 
 [doc_background_3]
 
-The class template __polymorphic_allocator__ wraps a __memory_resource__
+The class template `polymorphic_allocator` wraps a `memory_resource`
 pointer and meets the requirements of __Allocator__, allowing it to be
 used where an allocator is expected. The standard provides type aliases
 using the polymorphic allocator for standard containers:
@@ -71,28 +71,28 @@ instance of the library's custom memory resource as shown below:
 
 [doc_background_7]
 
-This can be worked around by declaring the container to use a custom
-allocator (perhaps using a `std::shared_ptr< memory_resource >` as a
-data member). This hinders library composition; every library now
-exports unique, incompatible container types. A raw memory resource
-pointer is also easy to misuse:
+This can be worked around by declaring the container to use a custom allocator
+(perhaps using a `std::shared_ptr< std::pmr::memory_resource >` as
+a data member). This hinders library composition; every library now exports
+unique, incompatible container types. A raw memory resource pointer is also
+easy to misuse:
 
 [doc_background_8]
 
 Workarounds for this problem are worse than the problem itself. The library
-could return a pair with the vector and `unique_ptr<memory_resource>`
-which the caller must manage. Or the library could change its function
-signatures to accept a `memory_resource*` provided by the caller, where
-the library also makes public the desired memory resources
-(`my_resource` above).
+could return a pair with the vector and
+`std::unique_ptr<std::pmr::memory_resource>` which the caller must
+manage. Or the library could change its function signatures to accept a
+`memory_resource*` provided by the caller, where the library also makes public
+the desired memory resources (`my_resource` above).
 
 [heading Problem Statement]
 
 We would like an allocator model using a single type `T` with the
 following properties:
 
 * `T` is not a class template
-* `T` references a __memory_resource__
+* `T` references a `memory_resource`
 * `T` supports both reference semantics or shared ownership
 * `T` interoperates with code already using `std::pmr`
 

doc/qbk/quickref.xml

@@ -105,15 +105,15 @@
       <entry valign="top">
         <bridgehead renderas="sect3">Aliases</bridgehead>
         <simplelist type="vert" columns="1">
-          <member><link linkend="json.ref.boost__json__error_category">error_category</link></member>
-          <member><link linkend="json.ref.boost__json__error_code">error_code</link></member>
-          <member><link linkend="json.ref.boost__json__error_condition">error_condition</link></member>
-          <member><link linkend="json.ref.boost__json__memory_resource">memory_resource</link></member>
+          <member><link linkend="json.ref.boost__json__error_category"><emphasis role="red">error_category</emphasis></link></member>
+          <member><link linkend="json.ref.boost__json__error_code"><emphasis role="red">error_code</emphasis></link></member>
+          <member><link linkend="json.ref.boost__json__error_condition"><emphasis role="red">error_condition</emphasis></link></member>
+          <member><link linkend="json.ref.boost__json__memory_resource"><emphasis role="red">memory_resource</emphasis></link></member>
           <member><link linkend="json.ref.boost__json__parser_for">parser_for</link></member>
-          <member><link linkend="json.ref.boost__json__polymorphic_allocator">polymorphic_allocator</link></member>
-          <member><link linkend="json.ref.boost__json__result">result</link></member>
+          <member><link linkend="json.ref.boost__json__polymorphic_allocator"><emphasis role="red">polymorphic_allocator</emphasis></link></member>
+          <member><link linkend="json.ref.boost__json__result"><emphasis role="red">result</emphasis></link></member>
           <member><link linkend="json.ref.boost__json__string_view">string_view</link></member>
-          <member><link linkend="json.ref.boost__json__system_error">system_error</link></member>
+          <member><link linkend="json.ref.boost__json__system_error"><emphasis role="red">system_error</emphasis></link></member>
         </simplelist>
         <bridgehead renderas="sect3">P0308R0</bridgehead>
         <simplelist type="vert" columns="1">

example/file.hpp

@@ -20,7 +20,7 @@ class file
     long size_ = 0;
 
     void
-    fail(boost::json::error_code& ec)
+    fail(boost::system::error_code& ec)
     {
         ec.assign( errno, boost::system::generic_category() );
     }
@@ -69,7 +69,7 @@ class file
     open(
         char const* path,
         char const* mode,
-        boost::json::error_code& ec)
+        boost::system::error_code& ec)
     {
         close();
 #if defined(_MSC_VER)
@@ -99,10 +99,10 @@ class file
         char const* path,
         char const* mode)
     {
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         open(path, mode, ec);
         if(ec)
-            throw boost::json::system_error(ec);
+            throw boost::system::system_error(ec);
     }
 
     long
@@ -118,7 +118,7 @@ class file
     }
 
     std::size_t
-    read( char* data, std::size_t size, boost::json::error_code& ec)
+    read( char* data, std::size_t size, boost::system::error_code& ec)
     {
         auto const nread = std::fread( data, 1, size, f_ );
         if( std::ferror(f_) )
@@ -129,17 +129,17 @@ class file
     std::size_t
     read( char* data, std::size_t size )
     {
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         auto const nread = read( data, size, ec );
         if(ec)
-            throw boost::json::system_error(ec);
+            throw boost::system::system_error(ec);
         return nread;
     }
 };
 
 inline
 std::string
-read_file( char const* path, boost::json::error_code& ec )
+read_file( char const* path, boost::system::error_code& ec )
 {
     file f;
     f.open( path, "r", ec );
@@ -157,10 +157,10 @@ inline
 std::string
 read_file( char const* path )
 {
-    boost::json::error_code ec;
+    boost::system::error_code ec;
     auto s = read_file( path, ec);
     if(ec)
-        throw boost::json::system_error(ec);
+        throw boost::system::system_error(ec);
     return s;
 }
 

example/parse_into.cpp

@@ -176,7 +176,7 @@ int main()
 
         coordinates1 w;
 
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         boost::json::parse_into( w, json, ec );
 
         if( ec.failed() )
@@ -212,7 +212,7 @@ int main()
 
         coordinates2 w;
 
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         boost::json::parse_into( w, json, ec );
 
         if( ec.failed() )

example/parse_into_canada.cpp

@@ -82,7 +82,7 @@ int main()
 
         canada w;
 
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         boost::json::parse_into( w, json, ec );
 
         if( ec.failed() )

example/parse_into_citm_catalog.cpp

@@ -129,7 +129,7 @@ int main()
 
         citm_catalog w;
 
-        boost::json::error_code ec;
+        boost::system::error_code ec;
         boost::json::parse_into( w, json, ec );
 
         if( ec.failed() )

example/pretty.cpp

@@ -27,7 +27,7 @@ parse_file( char const* filename )
 {
     file f( filename, "r" );
     json::stream_parser p;
-    json::error_code ec;
+    boost::system::error_code ec;
     do
     {
         char buf[4096];

example/use_allocator.cpp

@@ -42,7 +42,7 @@ template<
         is_sequence_like<T>::value &&
         std::uses_allocator<T, Alloc>::value
         >::type >
-result<T>
+boost::system::result<T>
 tag_invoke( try_value_to_tag<T>, const value& jv, const use_allocator_t<Alloc>& ctx, const FullContext& full_ctx )
 {