import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / detail / reactive_serial_port_service.hpp

diff --git a/ceph/src/boost/boost/asio/detail/reactive_serial_port_service.hpp b/ceph/src/boost/boost/asio/detail/reactive_serial_port_service.hpp
index 225f0828f553173226e58cf86da8eb6bae4afb3f..776762fc39350b94855c116ab98a9a3da70c5dfa 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/reactive_serial_port_service.hpp
+++ b/ceph/src/boost/boost/asio/detail/reactive_serial_port_service.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_serial_port_service.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <boost/asio/error.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/execution_context.hpp>
 #include <boost/asio/serial_port_base.hpp>
 #include <boost/asio/detail/descriptor_ops.hpp>
 #include <boost/asio/detail/reactive_descriptor_service.hpp>
@@ -36,7 +36,7 @@ namespace detail {
 
 // Extend reactive_descriptor_service to provide serial port support.
 class reactive_serial_port_service :
-  public service_base<reactive_serial_port_service>
+  public execution_context_service_base<reactive_serial_port_service>
 {
 public:
   // The native type of a serial port.
@@ -45,8 +45,7 @@ public:
   // The implementation type of the serial port.
   typedef reactive_descriptor_service::implementation_type implementation_type;
 
-  BOOST_ASIO_DECL reactive_serial_port_service(
-      boost::asio::io_context& io_context);
+  BOOST_ASIO_DECL reactive_serial_port_service(execution_context& context);
 
   // Destroy all user-defined handler objects owned by the service.
   BOOST_ASIO_DECL void shutdown();
@@ -141,9 +140,8 @@ public:
   boost::system::error_code send_break(implementation_type& impl,
       boost::system::error_code& ec)
   {
-    errno = 0;
-    descriptor_ops::error_wrapper(::tcsendbreak(
-          descriptor_service_.native_handle(impl), 0), ec);
+    int result = ::tcsendbreak(descriptor_service_.native_handle(impl), 0);
+    descriptor_ops::get_last_error(ec, result < 0);
     return ec;
   }
 
@@ -157,11 +155,12 @@ public:
 
   // Start an asynchronous write. The data being written must be valid for the
   // lifetime of the asynchronous operation.
-  template <typename ConstBufferSequence, typename Handler>
+  template <typename ConstBufferSequence, typename Handler, typename IoExecutor>
   void async_write_some(implementation_type& impl,
-      const ConstBufferSequence& buffers, Handler& handler)
+      const ConstBufferSequence& buffers,
+      Handler& handler, const IoExecutor& io_ex)
   {
-    descriptor_service_.async_write_some(impl, buffers, handler);
+    descriptor_service_.async_write_some(impl, buffers, handler, io_ex);
   }
 
   // Read some data. Returns the number of bytes received.
@@ -174,11 +173,13 @@ public:
 
   // Start an asynchronous read. The buffer for the data being received must be
   // valid for the lifetime of the asynchronous operation.
-  template <typename MutableBufferSequence, typename Handler>
+  template <typename MutableBufferSequence,
+      typename Handler, typename IoExecutor>
   void async_read_some(implementation_type& impl,
-      const MutableBufferSequence& buffers, Handler& handler)
+      const MutableBufferSequence& buffers,
+      Handler& handler, const IoExecutor& io_ex)
   {
-    descriptor_service_.async_read_some(impl, buffers, handler);
+    descriptor_service_.async_read_some(impl, buffers, handler, io_ex);
   }
 
 private: