Fix issue #89: Remove the symbol BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT

daniele77 · Jan 24, 2021 · 29fef14 · 29fef14 · k-morozov · Dec 29, 2021
1 parent f8abeb6
commit 29fef14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/include/cli/detail/newboostasiolib.h b/include/cli/detail/newboostasiolib.h
@@ -31,11 +31,6 @@
 #define CLI_DETAIL_NEWBOOSTASIOLIB_H_
 
 #include <boost/version.hpp>
-
-#if BOOST_VERSION >= 107400
-    #define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-#endif
-
 #include <boost/asio.hpp>
 
 namespace cli
@@ -61,7 +56,12 @@ class NewBoostAsioLib
             executor(socket.get_executor()) {}
         template <typename T> void Post(T&& t) { boost::asio::post(executor, std::forward<T>(t)); }
     private:
-        boost::asio::executor executor;
+#if BOOST_VERSION >= 107400
+    using AsioExecutor = boost::asio::any_io_executor;
+#else
+    using AsioExecutor = boost::asio::executor;
+#endif
+         AsioExecutor executor;
     };
 
     static boost::asio::ip::address IpAddressFromString(const std::string& address)

diff --git a/include/cli/detail/newstandaloneasiolib.h b/include/cli/detail/newstandaloneasiolib.h
@@ -31,11 +31,6 @@
 #define CLI_DETAIL_NEWSTANDALONEASIOLIB_H_
 
 #include <asio/version.hpp>
-
-#if ASIO_VERSION >= 101700
-    #define ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-#endif
-
 #include <asio.hpp>
 
 namespace cli
@@ -61,7 +56,12 @@ class NewStandaloneAsioLib
             executor(socket.get_executor()) {}
         template <typename T> void Post(T&& t) { asio::post(executor, std::forward<T>(t)); }
     private:
-        asio::executor executor;
+#if ASIO_VERSION >= 101700
+    using AsioExecutor = asio::any_io_executor;
+#else
+    using AsioExecutor = asio::executor;
+#endif
+         AsioExecutor executor;
     };
 
     static asio::ip::address IpAddressFromString(const std::string& address)