make it compile with boost >= 1.66.0 (FreeOpcUa#324)

ralf1070 · Jan 25, 2019 · 2f2c886 · 2f2c886
1 parent 18e5a08
commit 2f2c886
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 36 deletions.
diff --git a/include/opc/ua/server/addons/asio_addon.h b/include/opc/ua/server/addons/asio_addon.h
@@ -21,17 +21,7 @@
 
 
 #include <opc/common/addons_core/addon.h>
-
-
-namespace boost
-{
-namespace asio
-{
-
-class io_service;
-
-}
-}
+#include <opc/ua/services/services.h>
 
 namespace OpcUa
 {

diff --git a/include/opc/ua/server/opc_tcp_async.h b/include/opc/ua/server/opc_tcp_async.h
@@ -22,14 +22,6 @@
 #include <opc/ua/services/services.h>
 #include <opc/common/interface.h>
 
-namespace boost
-{
-namespace asio
-{
-class io_service;
-}
-}
-
 namespace OpcUa
 {
 namespace Server

diff --git a/include/opc/ua/server/subscription_service.h b/include/opc/ua/server/subscription_service.h
@@ -14,15 +14,6 @@
 #include <opc/ua/server/address_space.h>
 #include <opc/ua/services/subscriptions.h>
 
-
-namespace boost
-{
-namespace asio
-{
-class io_service;
-}
-}
-
 namespace OpcUa
 {
 namespace Server

diff --git a/include/opc/ua/services/services.h b/include/opc/ua/services/services.h
@@ -25,6 +25,22 @@
 #include <memory>
 #include <vector>
 
+#include <boost/version.hpp>
+
+
+namespace boost
+{
+namespace asio
+{
+#if BOOST_VERSION < 106600
+  class io_service;
+#else
+  class io_context;
+  typedef io_context io_service;
+#endif
+}
+}
+
 namespace OpcUa
 {
 

diff --git a/src/server/server_object.h b/src/server/server_object.h
@@ -24,14 +24,6 @@
 
 #include "timer.h"
 
-namespace boost
-{
-namespace asio
-{
-class io_service;
-}
-}
-
 namespace OpcUa
 {
 namespace Server