Merge pull request #308 from shirzartenwer/feat_macos_build

fix: support asio 1.33

Author: ursfassler

CMakeLists.txt

@@ -41,6 +41,7 @@ endif()
 
 if(CUKE_STRICT)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASIO_NO_DEPRECATED")
 endif()
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)

include/cucumber-cpp/internal/connectors/wire/WireServer.hpp

@@ -29,7 +29,7 @@ class CUCUMBER_CPP_EXPORT SocketServer {
 
 protected:
     const ProtocolHandler* protocolHandler;
-    asio::io_service ios;
+    asio::io_context ios;
 
     template<typename Protocol>
     void doListen(

src/connectors/wire/WireServer.cpp

@@ -23,8 +23,9 @@ void SocketServer::doListen(
 
 template<typename Protocol>
 void SocketServer::doAcceptOnce(asio::basic_socket_acceptor<Protocol>& acceptor) {
-    typename Protocol::iostream stream;
-    acceptor.accept(*stream.rdbuf());
+    typename Protocol::socket socket(ios);
+    acceptor.accept(socket);
+    typename Protocol::iostream stream(std::move(socket));
     processStream(stream);
 }
 

src/main.cpp

@@ -31,7 +31,7 @@ void acceptWireProtocol(
     {
         TCPSocketServer* const tcpServer = new TCPSocketServer(&protocolHandler);
         server.reset(tcpServer);
-        tcpServer->listen(asio::ip::tcp::endpoint(asio::ip::address::from_string(host), port));
+        tcpServer->listen(asio::ip::tcp::endpoint(asio::ip::make_address(host), port));
         if (verbose)
             std::clog << "Listening on " << tcpServer->listenEndpoint() << std::endl;
     }

tests/integration/WireServerTest.cpp

@@ -141,7 +141,7 @@ class TCPSocketServerLocalhostTest : public SocketServerTest {
 
     SocketServer* createListeningServer() override {
         server.reset(new TCPSocketServer(&protocolHandler));
-        server->listen(asio::ip::tcp::endpoint(asio::ip::address::from_string("127.0.0.1"), 0));
+        server->listen(asio::ip::tcp::endpoint(asio::ip::make_address("127.0.0.1"), 0));
         return server.get();
     }