Adaptation for Asio from Boost-1.87.

eao197 · eao197 · commit a8475a4cc799 · 2025-02-04T12:27:33.000+03:00
diff --git 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
@@ -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 )
@@ -620,7 +620,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 = std::get_if<asio_ns::ip::address>( &from ) )
 			{
diff --git a/dev/restinio/impl/connection.hpp b/dev/restinio/impl/connection.hpp
@@ -1131,8 +1131,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
@@ -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
@@ -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
@@ -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/default_constructed_settings/main.cpp b/dev/test/default_constructed_settings/main.cpp
@@ -291,7 +291,7 @@ TEST_CASE( "Acceptor options" , "[settings][acceptor_options]" )
 
 	acceptor_option_setter = s.acceptor_options_setter();
 
-	asio_ns::io_service io_svc;
+	asio_ns::io_context io_svc;
 	asio_ns::ip::tcp::acceptor dummy_acceptor{ io_svc };
 
 	restinio::acceptor_options_t acceptor_options{ dummy_acceptor };
@@ -318,7 +318,7 @@ TEST_CASE( "Socket options" , "[settings][socket_options]" )
 
 	socket_option_setter = s.socket_options_setter();
 
-	asio_ns::io_service io_svc;
+	asio_ns::io_context io_svc;
 	asio_ns::ip::tcp::socket dummy_socket{ io_svc };
 	restinio::socket_options_t socket_options{ dummy_socket };
 
diff --git 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
@@ -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
@@ -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/ref_qualifiers_settings/main.cpp b/dev/test/ref_qualifiers_settings/main.cpp
@@ -145,7 +145,7 @@ TEST_CASE( "Ref-qualifiers" , "[settings][ref_qualifiers]" )
 			{
 				auto acceptor_option_setter = settings.acceptor_options_setter();
 
-				restinio::asio_ns::io_service io_svc;
+				restinio::asio_ns::io_context io_svc;
 				restinio::asio_ns::ip::tcp::acceptor dummy_acceptor{ io_svc };
 
 				restinio::acceptor_options_t acceptor_options{ dummy_acceptor };
@@ -158,7 +158,7 @@ TEST_CASE( "Ref-qualifiers" , "[settings][ref_qualifiers]" )
 			{
 				auto socket_option_setter = settings.socket_options_setter();
 
-				restinio::asio_ns::io_service io_svc;
+				restinio::asio_ns::io_context io_svc;
 				restinio::asio_ns::ip::tcp::socket dummy_socket{ io_svc };
 
 				restinio::socket_options_t socket_options{ dummy_socket };
diff --git 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
@@ -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
@@ -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
@@ -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 ) };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ class acceptor_t final`
`263`	`263`	`ep = m_acceptor.local_endpoint();`
`264`	`264`
`265`	`265`	`// Now we can switch acceptor to listen state.`
`266`		`- m_acceptor.listen( asio_ns::socket_base::max_connections );`
	`266`	`+ m_acceptor.listen( asio_ns::socket_base::max_listen_connections );`
`267`	`267`
`268`	`268`	`// Call accept connections routine.`
`269`	`269`	`for( std::size_t i = 0; i< this->concurrent_accept_sockets_count(); ++i )`
`@@ -620,7 +620,7 @@ class acceptor_t final`
`620`	`620`	`else if( str_addr == "ip6-localhost" )`
`621`	`621`	`str_addr = "::1";`
`622`	`622`
`623`		`- result = asio_ns::ip::address::from_string( str_addr );`
	`623`	`+ result = asio_ns::ip::make_address( str_addr );`
`624`	`624`	`}`
`625`	`625`	`else if( auto * addr_v = std::get_if<asio_ns::ip::address>( &from ) )`
`626`	`626`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ auto`
`16`	`16`	`make_dummy_endpoint()`
`17`	`17`	`{`
`18`	`18`	`return restinio::endpoint_t{`
`19`		`- restinio::asio_ns::ip::address::from_string("127.0.0.1"),`
	`19`	`+ restinio::asio_ns::ip::make_address("127.0.0.1"),`
`20`	`20`	`12345u`
`21`	`21`	`};`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ auto`
`15`	`15`	`make_dummy_endpoint()`
`16`	`16`	`{`
`17`	`17`	`return restinio::endpoint_t{`
`18`		`- restinio::asio_ns::ip::address::from_string("127.0.0.1"),`
	`18`	`+ restinio::asio_ns::ip::make_address("127.0.0.1"),`
`19`	`19`	`12345u`
`20`	`20`	`};`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ perform_test()`
`116`	`116`	`[&request_handler]( auto & settings ){`
`117`	`117`	`settings`
`118`	`118`	`.port( utest_default_port() )`
`119`		`- .address( restinio::asio_ns::ip::address::from_string( "127.0.0.1" ) )`
	`119`	`+ .address( restinio::asio_ns::ip::make_address( "127.0.0.1" ) )`
`120`	`120`	`.request_handler( request_handler );`
`121`	`121`	`}`
`122`	`122`	`};`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ auto`
`39`	`39`	`make_dummy_endpoint()`
`40`	`40`	`{`
`41`	`41`	`return restinio::endpoint_t{`
`42`		`- restinio::asio_ns::ip::address::from_string("127.0.0.1"),`
	`42`	`+ restinio::asio_ns::ip::make_address("127.0.0.1"),`
`43`	`43`	`12345u`
`44`	`44`	`};`
`45`	`45`	`}`