X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fasio%2Ftest%2Fsignal_set.cpp;h=f04f194d5cabb24e9ee8bf3422351d024aad2f3b;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=7dd74bae39a7083edb5f39e8fa91443d757ab667;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/asio/test/signal_set.cpp b/ceph/src/boost/libs/asio/test/signal_set.cpp
index 7dd74bae3..f04f194d5 100644
--- a/ceph/src/boost/libs/asio/test/signal_set.cpp
+++ b/ceph/src/boost/libs/asio/test/signal_set.cpp
@@ -2,7 +2,7 @@
 // signal_set.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,7 +17,7 @@
 #include <boost/asio/signal_set.hpp>
 
 #include "archetypes/async_result.hpp"
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 #include "unit_test.hpp"
 
 //------------------------------------------------------------------------------
@@ -39,21 +39,29 @@ void test()
 
   try
   {
-    io_service ios;
+    io_context ioc;
     archetypes::lazy_handler lazy;
     boost::system::error_code ec;
 
     // basic_signal_set constructors.
 
-    signal_set set1(ios);
-    signal_set set2(ios, 1);
-    signal_set set3(ios, 1, 2);
-    signal_set set4(ios, 1, 2, 3);
+    signal_set set1(ioc);
+    signal_set set2(ioc, 1);
+    signal_set set3(ioc, 1, 2);
+    signal_set set4(ioc, 1, 2, 3);
 
     // basic_io_object functions.
 
-    io_service& ios_ref = set1.get_io_service();
-    (void)ios_ref;
+    signal_set::executor_type ex = set1.get_executor();
+    (void)ex;
+
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+    io_context& ioc_ref = set1.get_io_context();
+    (void)ioc_ref;
+
+    io_context& ioc_ref2 = set1.get_io_service();
+    (void)ioc_ref2;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     // basic_signal_set functions.