diff options
Diffstat (limited to 'boost/asio/basic_socket_streambuf.hpp')
-rw-r--r-- | boost/asio/basic_socket_streambuf.hpp | 50 |
1 files changed, 15 insertions, 35 deletions
diff --git a/boost/asio/basic_socket_streambuf.hpp b/boost/asio/basic_socket_streambuf.hpp index 0a2bbe56a6..99106020e7 100644 --- a/boost/asio/basic_socket_streambuf.hpp +++ b/boost/asio/basic_socket_streambuf.hpp @@ -2,7 +2,7 @@ // basic_socket_streambuf.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2019 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) @@ -28,17 +28,9 @@ #include <boost/asio/detail/throw_error.hpp> #include <boost/asio/io_context.hpp> -#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES) -# include <boost/asio/stream_socket_service.hpp> -#endif // defined(BOOST_ASIO_ENABLE_OLD_SERVICES) - #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \ && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM) -# if defined(BOOST_ASIO_ENABLE_OLD_SERVICES) -# include <boost/asio/deadline_timer_service.hpp> -# else // defined(BOOST_ASIO_ENABLE_OLD_SERVICES) -# include <boost/asio/detail/deadline_timer_service.hpp> -# endif // defined(BOOST_ASIO_ENABLE_OLD_SERVICES) +# include <boost/asio/detail/deadline_timer_service.hpp> #else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM) # include <boost/asio/steady_timer.hpp> @@ -55,7 +47,7 @@ // { // init_buffers(); // typedef typename Protocol::resolver resolver_type; -// resolver_type resolver(socket().get_executor().context()); +// resolver_type resolver(socket().get_executor()); // connect_to_endpoints( // resolver.resolve(x1, ..., xn, ec_)); // return !ec_ ? this : 0; @@ -68,7 +60,7 @@ { \ init_buffers(); \ typedef typename Protocol::resolver resolver_type; \ - resolver_type resolver(socket().get_executor().context()); \ + resolver_type resolver(socket().get_executor()); \ connect_to_endpoints( \ resolver.resolve(BOOST_ASIO_VARIADIC_BYVAL_ARGS(n), ec_)); \ return !ec_ ? this : 0; \ @@ -77,10 +69,6 @@ #endif // !defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES) -#if !defined(BOOST_ASIO_ENABLE_OLD_SERVICES) -# define BOOST_ASIO_SVC_T1 detail::deadline_timer_service<traits_helper> -#endif // !defined(BOOST_ASIO_ENABLE_OLD_SERVICES) - #include <boost/asio/detail/push_options.hpp> namespace boost { @@ -125,18 +113,15 @@ protected: #define BOOST_ASIO_BASIC_SOCKET_STREAMBUF_FWD_DECL // Forward declaration with defaulted arguments. -template <typename Protocol - BOOST_ASIO_SVC_TPARAM_DEF1(= stream_socket_service<Protocol>), +template <typename Protocol, #if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) \ && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM) typename Clock = boost::posix_time::ptime, - typename WaitTraits = time_traits<Clock> - BOOST_ASIO_SVC_TPARAM1_DEF2(= deadline_timer_service<Clock, WaitTraits>)> + typename WaitTraits = time_traits<Clock> > #else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM) typename Clock = chrono::steady_clock, - typename WaitTraits = wait_traits<Clock> - BOOST_ASIO_SVC_TPARAM1_DEF1(= steady_timer::service_type)> + typename WaitTraits = wait_traits<Clock> > #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME) // && defined(BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM) class basic_socket_streambuf; @@ -149,17 +134,16 @@ template <typename Protocol, typename Clock = chrono::steady_clock, typename WaitTraits = wait_traits<Clock> > #else // defined(GENERATING_DOCUMENTATION) -template <typename Protocol BOOST_ASIO_SVC_TPARAM, - typename Clock, typename WaitTraits BOOST_ASIO_SVC_TPARAM1> +template <typename Protocol, typename Clock, typename WaitTraits> #endif // defined(GENERATING_DOCUMENTATION) class basic_socket_streambuf : public std::streambuf, private detail::socket_streambuf_io_context, private detail::socket_streambuf_buffers, #if defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION) - private basic_socket<Protocol BOOST_ASIO_SVC_TARG> + private basic_socket<Protocol> #else // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION) - public basic_socket<Protocol BOOST_ASIO_SVC_TARG> + public basic_socket<Protocol> #endif // defined(BOOST_ASIO_NO_DEPRECATED) || defined(GENERATING_DOCUMENTATION) { private: @@ -208,7 +192,7 @@ public: /// Construct a basic_socket_streambuf without establishing a connection. basic_socket_streambuf() : detail::socket_streambuf_io_context(new io_context), - basic_socket<Protocol BOOST_ASIO_SVC_TARG>(*default_io_context_), + basic_socket<Protocol>(*default_io_context_), expiry_time_(max_expiry_time()) { init_buffers(); @@ -218,7 +202,7 @@ public: /// Construct a basic_socket_streambuf from the supplied socket. explicit basic_socket_streambuf(basic_stream_socket<protocol_type> s) : detail::socket_streambuf_io_context(0), - basic_socket<Protocol BOOST_ASIO_SVC_TARG>(std::move(s)), + basic_socket<Protocol>(std::move(s)), expiry_time_(max_expiry_time()) { init_buffers(); @@ -227,7 +211,7 @@ public: /// Move-construct a basic_socket_streambuf from another. basic_socket_streambuf(basic_socket_streambuf&& other) : detail::socket_streambuf_io_context(other), - basic_socket<Protocol BOOST_ASIO_SVC_TARG>(std::move(other.socket())), + basic_socket<Protocol>(std::move(other.socket())), ec_(other.ec_), expiry_time_(other.expiry_time_) { @@ -300,7 +284,7 @@ public: { init_buffers(); typedef typename Protocol::resolver resolver_type; - resolver_type resolver(socket().get_executor().context()); + resolver_type resolver(socket().get_executor()); connect_to_endpoints(resolver.resolve(x..., ec_)); return !ec_ ? this : 0; } @@ -323,7 +307,7 @@ public: } /// Get a reference to the underlying socket. - basic_socket<Protocol BOOST_ASIO_SVC_TARG>& socket() + basic_socket<Protocol>& socket() { return *this; } @@ -696,10 +680,6 @@ private: #include <boost/asio/detail/pop_options.hpp> -#if !defined(BOOST_ASIO_ENABLE_OLD_SERVICES) -# undef BOOST_ASIO_SVC_T1 -#endif // !defined(BOOST_ASIO_ENABLE_OLD_SERVICES) - #if !defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES) # undef BOOST_ASIO_PRIVATE_CONNECT_DEF #endif // !defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES) |