summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/asio/include/asio/impl/execution_context.hpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/asio/include/asio/impl/execution_context.hpp')
-rw-r--r--3rdparty/asio/include/asio/impl/execution_context.hpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/3rdparty/asio/include/asio/impl/execution_context.hpp b/3rdparty/asio/include/asio/impl/execution_context.hpp
index 2e44ec11fd7..ddbb99deba3 100644
--- a/3rdparty/asio/include/asio/impl/execution_context.hpp
+++ b/3rdparty/asio/include/asio/impl/execution_context.hpp
@@ -2,7 +2,7 @@
// impl/execution_context.hpp
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 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)
@@ -23,6 +23,8 @@
namespace asio {
+#if !defined(GENERATING_DOCUMENTATION)
+
template <typename Service>
inline Service& use_service(execution_context& e)
{
@@ -32,8 +34,7 @@ inline Service& use_service(execution_context& e)
return e.service_registry_->template use_service<Service>();
}
-#if !defined(GENERATING_DOCUMENTATION)
-# if defined(ASIO_HAS_VARIADIC_TEMPLATES)
+#if defined(ASIO_HAS_VARIADIC_TEMPLATES)
template <typename Service, typename... Args>
Service& make_service(execution_context& e, ASIO_MOVE_ARG(Args)... args)
@@ -46,7 +47,7 @@ Service& make_service(execution_context& e, ASIO_MOVE_ARG(Args)... args)
return result;
}
-# else // defined(ASIO_HAS_VARIADIC_TEMPLATES)
+#else // defined(ASIO_HAS_VARIADIC_TEMPLATES)
template <typename Service>
Service& make_service(execution_context& e)
@@ -74,8 +75,7 @@ Service& make_service(execution_context& e)
ASIO_VARIADIC_GENERATE(ASIO_PRIVATE_MAKE_SERVICE_DEF)
#undef ASIO_PRIVATE_MAKE_SERVICE_DEF
-# endif // defined(ASIO_HAS_VARIADIC_TEMPLATES)
-#endif // !defined(GENERATING_DOCUMENTATION)
+#endif // defined(ASIO_HAS_VARIADIC_TEMPLATES)
template <typename Service>
inline void add_service(execution_context& e, Service* svc)
@@ -95,6 +95,8 @@ inline bool has_service(execution_context& e)
return e.service_registry_->template has_service<Service>();
}
+#endif // !defined(GENERATING_DOCUMENTATION)
+
inline execution_context& execution_context::service::context()
{
return owner_;