Adaptation for Asio from Boost-1.87.

Gbp-Pq: Name 0001-Adaptation-for-Asio-from-Boost-1.87.patch

diff --git a/dev/restinio/http_server_run.hpp b/dev/restinio/http_server_run.hpp
index b9d17fcf1af8c6e8099f05eb93ea1e5524a37eef..5f422ad67b9c716570d210bc14fc76e142cf3e75 100644 (file)
--- a/dev/restinio/http_server_run.hpp
+++ b/dev/restinio/http_server_run.hpp
@@ -680,7 +680,9 @@ template<typename Traits>
 inline void
 initiate_shutdown( http_server_t<Traits> & server )
 {
-       server.io_context().post( [&server] {
+       asio_ns::post(
+               server.io_context(),
+               [&server] {
                        server.close_sync();
                        server.io_context().stop();
                } );

diff --git a/dev/restinio/impl/acceptor.hpp b/dev/restinio/impl/acceptor.hpp
index caa2fbf7e168c6bc332f4d13818261ad02f822f9..cdf7faebe41841b5c57fe9a8ac11ce2a349200ff 100644 (file)
--- a/dev/restinio/impl/acceptor.hpp
+++ b/dev/restinio/impl/acceptor.hpp
@@ -263,7 +263,7 @@ class acceptor_t final
                                ep = m_acceptor.local_endpoint();
 
                                // Now we can switch acceptor to listen state.
-                               m_acceptor.listen( asio_ns::socket_base::max_connections );
+                               m_acceptor.listen( asio_ns::socket_base::max_listen_connections );
 
                                // Call accept connections routine.
                                for( std::size_t i = 0; i< this->concurrent_accept_sockets_count(); ++i )
@@ -616,7 +616,7 @@ class acceptor_t final
                                else if( str_addr == "ip6-localhost" )
                                        str_addr = "::1";
 
-                               result = asio_ns::ip::address::from_string( str_addr );
+                               result = asio_ns::ip::make_address( str_addr );
                        }
                        else if( auto * addr_v = get_if<asio_ns::ip::address>( &from ) )
                        {

diff --git a/dev/restinio/impl/connection.hpp b/dev/restinio/impl/connection.hpp
index fa0c830d0e35675414ed2f48ddc1fb8deb21177f..a6385cc738f48b021dd20cba81b265c7c30fba95 100644 (file)
--- a/dev/restinio/impl/connection.hpp
+++ b/dev/restinio/impl/connection.hpp
@@ -1053,8 +1053,8 @@ class connection_t final
                                        m_logger.trace( [&]{
                                                // Get status line:
                                                const string_view_t status_line{
-                                                               asio_ns::buffer_cast< const char * >(
-                                                                       next_write_group->first.items().front().buf() ),
+                                                               static_cast< const char * >(
+                                                                       next_write_group->first.items().front().buf().data() ),
                                                                next_write_group->first.status_line_size() };
 
                                                return fmt::format(

diff --git a/dev/test/basic_auth/main.cpp b/dev/test/basic_auth/main.cpp
index f20e727dbd2361601d9486698af6ef2c49cbbb4c..2f9e03a3f6918768871d91e8ad65ba238764511d 100644 (file)
--- a/dev/test/basic_auth/main.cpp
+++ b/dev/test/basic_auth/main.cpp
@@ -16,7 +16,7 @@ auto
 make_dummy_endpoint()
 {
        return restinio::endpoint_t{
-                       restinio::asio_ns::ip::address::from_string("127.0.0.1"),
+                       restinio::asio_ns::ip::make_address("127.0.0.1"),
                        12345u
        };
 }

diff --git a/dev/test/bearer_auth/main.cpp b/dev/test/bearer_auth/main.cpp
index b5e94fd756aff5e770856460d927ff9d7afb1b1a..264724b6137f01ae5bbce543f69bbe33ae873a58 100644 (file)
--- a/dev/test/bearer_auth/main.cpp
+++ b/dev/test/bearer_auth/main.cpp
@@ -15,7 +15,7 @@ auto
 make_dummy_endpoint()
 {
        return restinio::endpoint_t{
-                       restinio::asio_ns::ip::address::from_string("127.0.0.1"),
+                       restinio::asio_ns::ip::make_address("127.0.0.1"),
                        12345u
        };
 }

diff --git a/dev/test/common/pub.hpp b/dev/test/common/pub.hpp
index 23d21bb5bf15f0491ed64681301580ac27a89b8e..090af23f2230253730dd0375962076397bad0033 100644 (file)
--- a/dev/test/common/pub.hpp
+++ b/dev/test/common/pub.hpp
@@ -40,7 +40,7 @@ do_with_socket(
 
        socket.connect(
                restinio::asio_ns::ip::tcp::endpoint{
-                       restinio::asio_ns::ip::address::from_string( str_addr ),
+                       restinio::asio_ns::ip::make_address( str_addr ),
                        port
                } );
 

diff --git a/dev/test/file_upload/main.cpp b/dev/test/file_upload/main.cpp
index 3528a08239fd526be634a0e054b5295ee301e574..bb355e786dc10fd68073b3155d8a35ff35bffa99 100644 (file)
--- a/dev/test/file_upload/main.cpp
+++ b/dev/test/file_upload/main.cpp
@@ -15,7 +15,7 @@ auto
 make_dummy_endpoint()
 {
        return restinio::endpoint_t{
-                       restinio::asio_ns::ip::address::from_string("127.0.0.1"),
+                       restinio::asio_ns::ip::make_address("127.0.0.1"),
                        12345u
        };
 }

diff --git a/dev/test/handle_requests/echo_body/main.cpp b/dev/test/handle_requests/echo_body/main.cpp
index f46a3cd17a080a3ab657d68ea907c5d66987accd..f4403bf5c4d33a5b7d5f7bbf49388db48cce4541 100644 (file)
--- a/dev/test/handle_requests/echo_body/main.cpp
+++ b/dev/test/handle_requests/echo_body/main.cpp
@@ -116,7 +116,7 @@ perform_test()
                        [&request_handler]( auto & settings ){
                                settings
                                        .port( utest_default_port() )
-                                       .address( restinio::asio_ns::ip::address::from_string( "127.0.0.1" ) )
+                                       .address( restinio::asio_ns::ip::make_address( "127.0.0.1" ) )
                                        .request_handler( request_handler );
                        }
                };

diff --git a/dev/test/multipart_body/main.cpp b/dev/test/multipart_body/main.cpp
index a0975faacd6b6dedc88e4a9101a7df59f14dbecd..40592f89be12c046169072886f5895589b259217 100644 (file)
--- a/dev/test/multipart_body/main.cpp
+++ b/dev/test/multipart_body/main.cpp
@@ -39,7 +39,7 @@ auto
 make_dummy_endpoint()
 {
        return restinio::endpoint_t{
-                       restinio::asio_ns::ip::address::from_string("127.0.0.1"),
+                       restinio::asio_ns::ip::make_address("127.0.0.1"),
                        12345u
        };
 }

diff --git a/dev/test/response_coordinator/main.cpp b/dev/test/response_coordinator/main.cpp
index 132509240c5076f0301f04dee43fffd04eca0758..8ff083f9f1e6550da05414eb708ff608ce4e6d71 100644 (file)
--- a/dev/test/response_coordinator/main.cpp
+++ b/dev/test/response_coordinator/main.cpp
@@ -33,7 +33,7 @@ make_string( const BUF & buf )
 {
        return
                std::string{
-                       asio_ns::buffer_cast< const char * >( buf.buf() ),
+                       static_cast< const char * >( buf.buf().data() ),
                        asio_ns::buffer_size( buf.buf() ) };
 }
 

diff --git a/dev/test/run_on_thread_pool/main.cpp b/dev/test/run_on_thread_pool/main.cpp
index d3e709cf1dee2c6ac9cacc404bff9b978cda1839..10ab951ee4922d1b24c0d2ba4d47f2a91542eb1c 100644 (file)
--- a/dev/test/run_on_thread_pool/main.cpp
+++ b/dev/test/run_on_thread_pool/main.cpp
@@ -92,9 +92,11 @@ TEST_CASE( "on thread pool with break signals" , "[with_break_signal]" )
 
        // Wait for HTTP server to run.
        std::promise<void> started;
-       http_server.io_context().post( [&started] {
-                       started.set_value();
-               } );
+       restinio::asio_ns::post(
+                       http_server.io_context(),
+                       [&started] {
+                               started.set_value();
+                       } );
        started.get_future().get();
 
        std::string response;
@@ -160,7 +162,9 @@ TEST_CASE( "on thread pool without break signals" , "[without_break_signal]" )
 
        // Wait for HTTP server to run.
        std::promise<void> started;
-       http_server.io_context().post( [&started] {
+       restinio::asio_ns::post(
+               http_server.io_context(),
+               [&started] {
                        started.set_value();
                } );
        started.get_future().get();
@@ -228,7 +232,9 @@ TEST_CASE( "server on thread pool runner" , "[on_pool_runner]" )
 
        // Wait for HTTP server to run.
        std::promise<void> started;
-       http_server.io_context().post( [&started] {
+       restinio::asio_ns::post(
+               http_server.io_context(),
+               [&started] {
                        started.set_value();
                } );
        started.get_future().get();

diff --git a/dev/test/try_parse_field/main.cpp b/dev/test/try_parse_field/main.cpp
index b76e3c930cdfc227bc377c8ef0dd0eaf33fa0561..7134be5f3a9cd61bc8d0427b1aff1583218d279f 100644 (file)
--- a/dev/test/try_parse_field/main.cpp
+++ b/dev/test/try_parse_field/main.cpp
@@ -16,7 +16,7 @@ auto
 make_dummy_endpoint()
 {
        return restinio::endpoint_t{
-                       restinio::asio_ns::ip::address::from_string("127.0.0.1"),
+                       restinio::asio_ns::ip::make_address("127.0.0.1"),
                        12345u
        };
 }

diff --git a/dev/test/write_group_output_ctx/main.cpp b/dev/test/write_group_output_ctx/main.cpp
index b4e1e78b122a4b652d1ebc32aadc4e1ee87c5c0b..2093e840ce1967da2eaab422e3ab50d6d710d479 100644 (file)
--- a/dev/test/write_group_output_ctx/main.cpp
+++ b/dev/test/write_group_output_ctx/main.cpp
@@ -24,7 +24,7 @@ make_string( const asio_ns::const_buffer & buf )
 {
        return
                std::string{
-                       asio_ns::buffer_cast< const char * >( buf ),
+                       static_cast< const char * >( buf.data() ),
                        asio_ns::buffer_size( buf ) };
 }