X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fasio%2Fexample%2Fcpp03%2Fspawn%2Fecho_server.cpp;h=db6a1679f55c377f483c2716541fb42ed7f6090c;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=1fde20fb8195524b424ddb33874a656189839110;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/asio/example/cpp03/spawn/echo_server.cpp b/ceph/src/boost/libs/asio/example/cpp03/spawn/echo_server.cpp
index 1fde20fb8..db6a1679f 100644
--- a/ceph/src/boost/libs/asio/example/cpp03/spawn/echo_server.cpp
+++ b/ceph/src/boost/libs/asio/example/cpp03/spawn/echo_server.cpp
@@ -2,14 +2,14 @@
 // echo_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)
 //
 
 #include <boost/asio/deadline_timer.hpp>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/write.hpp>
@@ -23,10 +23,10 @@ using boost::asio::ip::tcp;
 class session : public boost::enable_shared_from_this<session>
 {
 public:
-  explicit session(boost::asio::io_service& io_service)
-    : strand_(io_service),
-      socket_(io_service),
-      timer_(io_service)
+  explicit session(boost::asio::io_context& io_context)
+    : strand_(io_context),
+      socket_(io_context),
+      timer_(io_context)
   {
   }
 
@@ -76,20 +76,20 @@ private:
     }
   }
 
-  boost::asio::io_service::strand strand_;
+  boost::asio::io_context::strand strand_;
   tcp::socket socket_;
   boost::asio::deadline_timer timer_;
 };
 
-void do_accept(boost::asio::io_service& io_service,
+void do_accept(boost::asio::io_context& io_context,
     unsigned short port, boost::asio::yield_context yield)
 {
-  tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v4(), port));
+  tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v4(), port));
 
   for (;;)
   {
     boost::system::error_code ec;
-    boost::shared_ptr<session> new_session(new session(io_service));
+    boost::shared_ptr<session> new_session(new session(io_context));
     acceptor.async_accept(new_session->socket(), yield[ec]);
     if (!ec) new_session->go();
   }
@@ -105,13 +105,13 @@ int main(int argc, char* argv[])
       return 1;
     }
 
-    boost::asio::io_service io_service;
+    boost::asio::io_context io_context;
 
-    boost::asio::spawn(io_service,
+    boost::asio::spawn(io_context,
         boost::bind(do_accept,
-          boost::ref(io_service), atoi(argv[1]), _1));
+          boost::ref(io_context), atoi(argv[1]), _1));
 
-    io_service.run();
+    io_context.run();
   }
   catch (std::exception& e)
   {