update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / asio / example / cpp03 / http / server / server.cpp

diff --git a/ceph/src/boost/libs/asio/example/cpp03/http/server/server.cpp b/ceph/src/boost/libs/asio/example/cpp03/http/server/server.cpp
index b2c9d2bc47769667547738a9b6a106eb9ca9a3da..1ebddad8d2c820ddff62cb03c7227a2330339038 100644 (file)
--- a/ceph/src/boost/libs/asio/example/cpp03/http/server/server.cpp
+++ b/ceph/src/boost/libs/asio/example/cpp03/http/server/server.cpp
@@ -2,7 +2,7 @@
 // server.cpp
 // ~~~~~~~~~~
 //
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +17,9 @@ namespace server {
 
 server::server(const std::string& address, const std::string& port,
     const std::string& doc_root)
-  : io_service_(),
-    signals_(io_service_),
-    acceptor_(io_service_),
+  : io_context_(),
+    signals_(io_context_),
+    acceptor_(io_context_),
     connection_manager_(),
     new_connection_(),
     request_handler_(doc_root)
@@ -35,9 +35,9 @@ server::server(const std::string& address, const std::string& port,
   signals_.async_wait(boost::bind(&server::handle_stop, this));
 
   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
-  boost::asio::ip::tcp::resolver resolver(io_service_);
-  boost::asio::ip::tcp::resolver::query query(address, port);
-  boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+  boost::asio::ip::tcp::resolver resolver(io_context_);
+  boost::asio::ip::tcp::endpoint endpoint =
+    *resolver.resolve(address, port).begin();
   acceptor_.open(endpoint.protocol());
   acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
   acceptor_.bind(endpoint);
@@ -48,16 +48,16 @@ server::server(const std::string& address, const std::string& port,
 
 void server::run()
 {
-  // The io_service::run() call will block until all asynchronous operations
+  // The io_context::run() call will block until all asynchronous operations
   // have finished. While the server is running, there is always at least one
   // asynchronous operation outstanding: the asynchronous accept call waiting
   // for new incoming connections.
-  io_service_.run();
+  io_context_.run();
 }
 
 void server::start_accept()
 {
-  new_connection_.reset(new connection(io_service_,
+  new_connection_.reset(new connection(io_context_,
         connection_manager_, request_handler_));
   acceptor_.async_accept(new_connection_->socket(),
       boost::bind(&server::handle_accept, this,
@@ -84,7 +84,7 @@ void server::handle_accept(const boost::system::error_code& e)
 void server::handle_stop()
 {
   // The server is stopped by cancelling all outstanding asynchronous
-  // operations. Once all operations have finished the io_service::run() call
+  // operations. Once all operations have finished the io_context::run() call
   // will exit.
   acceptor_.close();
   connection_manager_.stop_all();