ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/freeopcua/include_asio_first.patch

   1 diff --git a/src/core/subscription.cpp b/src/core/subscription.cpp
   2 index b690d3a..fdac2f3 100644
   3 --- a/src/core/subscription.cpp
   4 +++ b/src/core/subscription.cpp
   5 @@ -17,11 +17,10 @@
   6   *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.        *
   7   ******************************************************************************/
   8
   9 -
  10 -#include <opc/ua/subscription.h>
  11 +#include <boost/asio.hpp>
  12  #include <opc/ua/protocol/string_utils.h>
  13 +#include <opc/ua/subscription.h>
  14
  15 -#include <boost/asio.hpp>
  16  #include <iostream>
  17
  18  namespace OpcUa
  19 diff --git a/src/server/asio_addon.cpp b/src/server/asio_addon.cpp
  20 index 795a6b2..532ac3c 100644
  21 --- a/src/server/asio_addon.cpp
  22 +++ b/src/server/asio_addon.cpp
  23 @@ -17,9 +17,9 @@
  24   *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                *
  25   ******************************************************************************/
  26
  27 +#include <boost/asio.hpp>
  28  #include <opc/ua/server/addons/asio_addon.h>
  29
  30 -#include <boost/asio.hpp>
  31  #include <iostream>
  32  #include <thread>
  33
  34 diff --git a/src/server/internal_subscription.h b/src/server/internal_subscription.h
  35 index d42aa65..dd193a9 100644
  36 --- a/src/server/internal_subscription.h
  37 +++ b/src/server/internal_subscription.h
  38 @@ -1,6 +1,7 @@
  39
  40  #pragma once
  41
  42 +#include <boost/asio.hpp>
  43  //#include "address_space_internal.h"
  44  #include "subscription_service_internal.h"
  45
  46 @@ -11,7 +12,6 @@
  47  #include <opc/ua/protocol/string_utils.h>
  48  #include <opc/ua/services/attributes.h>
  49
  50 -#include <boost/asio.hpp>
  51  #include <boost/thread/shared_mutex.hpp>
  52  #include <chrono>
  53  #include <iostream>
  54 @@ -115,5 +115,3 @@ private:
  55
  56  }
  57  }
  58 -
  59 -
  60 diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
  61 index dc700c2..f3a66b8 100644
  62 --- a/src/server/opc_tcp_async.cpp
  63 +++ b/src/server/opc_tcp_async.cpp
  64 @@ -17,6 +17,7 @@
  65   *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                *
  66   ******************************************************************************/
  67
  68 +#include <boost/asio.hpp>
  69  #include "opc_tcp_processor.h"
  70
  71  #include <opc/ua/server/opc_tcp_async.h>
  72 @@ -29,7 +30,6 @@
  73  #include <opc/ua/protocol/input_from_buffer.h>
  74
  75  #include <array>
  76 -#include <boost/asio.hpp>
  77  #include <future>
  78  #include <iostream>
  79  #include <set>
  80 diff --git a/src/server/subscription_service_internal.h b/src/server/subscription_service_internal.h
  81 index 6b16e1d..f7e5dfe 100644
  82 --- a/src/server/subscription_service_internal.h
  83 +++ b/src/server/subscription_service_internal.h
  84 @@ -9,6 +9,7 @@
  85
  86  #pragma once
  87
  88 +#include <boost/asio.hpp>
  89  #include "address_space_addon.h"
  90  #include "internal_subscription.h"
  91
  92 @@ -20,7 +21,6 @@
  93  #include <opc/ua/protocol/strings.h>
  94  #include <opc/ua/protocol/string_utils.h>
  95
  96 -#include <boost/asio.hpp>
  97  #include <boost/thread/shared_mutex.hpp>
  98  #include <ctime>
  99  #include <limits>
 100 @@ -76,4 +76,3 @@ private:
 101  }
 102
 103  }
 104 -
 105 diff --git a/src/server/tcp_server.cpp b/src/server/tcp_server.cpp
 106 index b4f2000..2430820 100644
 107 --- a/src/server/tcp_server.cpp
 108 +++ b/src/server/tcp_server.cpp
 109 @@ -8,9 +8,6 @@
 110  /// http://www.gnu.org/licenses/lgpl.html)
 111  ///
 112
 113 -#ifdef _WIN32
 114 -#include <windows.h>
 115 -#endif
 116
 117  #include "tcp_server.h"
 118
 119 @@ -34,8 +31,18 @@
 120  #include <string.h>
 121  #include <sys/types.h>
 122
 123 -
 124  #ifdef _WIN32
 125 +#include <WinSock2.h>
 126 +#include <windows.h>
 127 +#if !defined SHUT_RD && defined SD_RECEIVE
 128 +#define SHUT_RD SD_RECEIVE
 129 +#endif
 130 +#if !defined SHUT_WR && defined SD_SEND
 131 +#define SHUT_WR SD_SEND
 132 +#endif
 133 +#if !defined SHUT_RDWR && defined SD_BOTH
 134 +#define SHUT_RDWR SD_BOTH
 135 +#endif
 136  #else
 137  #include <arpa/inet.h>
 138  #include <netdb.h>