summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/asio/include/asio/execution_context.hpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/asio/include/asio/execution_context.hpp')
-rw-r--r--3rdparty/asio/include/asio/execution_context.hpp29
1 files changed, 3 insertions, 26 deletions
diff --git a/3rdparty/asio/include/asio/execution_context.hpp b/3rdparty/asio/include/asio/execution_context.hpp
index 0d91195410e..bce8d431607 100644
--- a/3rdparty/asio/include/asio/execution_context.hpp
+++ b/3rdparty/asio/include/asio/execution_context.hpp
@@ -2,7 +2,7 @@
// execution_context.hpp
// ~~~~~~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 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)
@@ -20,7 +20,6 @@
#include <stdexcept>
#include <typeinfo>
#include "asio/detail/noncopyable.hpp"
-#include "asio/detail/variadic_templates.hpp"
#include "asio/detail/push_options.hpp"
@@ -109,13 +108,14 @@ public:
class id;
class service;
-protected:
+public:
/// Constructor.
ASIO_DECL execution_context();
/// Destructor.
ASIO_DECL ~execution_context();
+protected:
/// Shuts down all services in the context.
/**
* This function is implemented as follows:
@@ -223,8 +223,6 @@ public:
template <typename Service>
friend Service& use_service(io_context& ioc);
-#if defined(GENERATING_DOCUMENTATION)
-
/// Creates a service object and adds it to the execution_context.
/**
* This function is used to add a service to the execution_context.
@@ -240,27 +238,6 @@ public:
template <typename Service, typename... Args>
friend Service& make_service(execution_context& e, Args&&... args);
-#elif defined(ASIO_HAS_VARIADIC_TEMPLATES)
-
- template <typename Service, typename... Args>
- friend Service& make_service(execution_context& e,
- ASIO_MOVE_ARG(Args)... args);
-
-#else // defined(ASIO_HAS_VARIADIC_TEMPLATES)
-
- template <typename Service>
- friend Service& make_service(execution_context& e);
-
-#define ASIO_PRIVATE_MAKE_SERVICE_DEF(n) \
- template <typename Service, ASIO_VARIADIC_TPARAMS(n)> \
- friend Service& make_service(execution_context& e, \
- ASIO_VARIADIC_MOVE_PARAMS(n)); \
- /**/
- ASIO_VARIADIC_GENERATE(ASIO_PRIVATE_MAKE_SERVICE_DEF)
-#undef ASIO_PRIVATE_MAKE_SERVICE_DEF
-
-#endif // defined(ASIO_HAS_VARIADIC_TEMPLATES)
-
/// (Deprecated: Use make_service().) Add a service object to the
/// execution_context.
/**