1 files changed, 44 insertions, 74 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/winsock_init.hpp b/3rdParty/Boost/src/boost/asio/detail/winsock_init.hpp
index 186a8b5..ac24b0d 100644
--- a/3rdParty/Boost/src/boost/asio/detail/winsock_init.hpp
+++ b/3rdParty/Boost/src/boost/asio/detail/winsock_init.hpp
@@ -1,6 +1,6 @@
 //
-// winsock_init.hpp
-// ~~~~~~~~~~~~~~~~
+// detail/winsock_init.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
@@ -15,108 +15,78 @@
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
-#include <boost/asio/detail/push_options.hpp>
-
-#include <boost/asio/detail/push_options.hpp>
-#include <boost/config.hpp>
-#include <boost/system/system_error.hpp>
-#include <boost/asio/detail/pop_options.hpp>
+#include <boost/asio/detail/config.hpp>
 
 #if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
 
 #include <boost/asio/detail/push_options.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/asio/detail/pop_options.hpp>
-
-#include <boost/asio/error.hpp>
-#include <boost/asio/detail/noncopyable.hpp>
-#include <boost/asio/detail/socket_types.hpp>
 
 namespace boost {
 namespace asio {
 namespace detail {
 
-template <int Major = 2, int Minor = 0>
-class winsock_init
-  : private noncopyable
+class winsock_init_base
 {
-private:
-  // Structure to perform the actual initialisation.
-  struct do_init
+protected:
+  // Structure to track result of initialisation and number of uses. POD is used
+  // to ensure that the values are zero-initialised prior to any code being run.
+  struct data
   {
-    do_init()
-    {
-      WSADATA wsa_data;
-      result_ = ::WSAStartup(MAKEWORD(Major, Minor), &wsa_data);
-    }
-
-    ~do_init()
-    {
-      ::WSACleanup();
-    }
-
-    int result() const
-    {
-      return result_;
-    }
-
-    // Helper function to manage a do_init singleton. The static instance of the
-    // winsock_init object ensures that this function is always called before
-    // main, and therefore before any other threads can get started. The do_init
-    // instance must be static in this function to ensure that it gets
-    // initialised before any other global objects try to use it.
-    static boost::shared_ptr<do_init> instance()
-    {
-      static boost::shared_ptr<do_init> init(new do_init);
-      return init;
-    }
-
-  private:
-    int result_;
+    long init_count_;
+    long result_;
   };
 
+  BOOST_ASIO_DECL static void startup(data& d,
+      unsigned char major, unsigned char minor);
+
+  BOOST_ASIO_DECL static void cleanup(data& d);
+
+  BOOST_ASIO_DECL static void throw_on_error(data& d);
+};
+
+template <int Major = 2, int Minor = 0>
+class winsock_init : private winsock_init_base
+{
 public:
-  // Constructor.
-  winsock_init()
-    : ref_(do_init::instance())
+  winsock_init(bool allow_throw = true)
+  {
+    startup(data_, Major, Minor);
+    if (allow_throw)
+      throw_on_error(data_);
+  }
+
+  winsock_init(const winsock_init&)
   {
-    // Check whether winsock was successfully initialised. This check is not
-    // performed for the global instance since there will be nobody around to
-    // catch the exception.
-    if (this != &instance_ && ref_->result() != 0)
-    {
-      boost::system::system_error e(
-          boost::system::error_code(ref_->result(),
-            boost::asio::error::get_system_category()),
-          "winsock");
-      boost::throw_exception(e);
-    }
+    startup(data_, Major, Minor);
+    throw_on_error(data_);
   }
 
-  // Destructor.
   ~winsock_init()
   {
+    cleanup(data_);
   }
 
 private:
-  // Instance to force initialisation of winsock at global scope.
-  static winsock_init instance_;
-
-  // Reference to singleton do_init object to ensure that winsock does not get
-  // cleaned up until the last user has finished with it.
-  boost::shared_ptr<do_init> ref_;
+  static data data_;
 };
 
 template <int Major, int Minor>
-winsock_init<Major, Minor> winsock_init<Major, Minor>::instance_;
+winsock_init_base::data winsock_init<Major, Minor>::data_;
+
+// Static variable to ensure that winsock is initialised before main, and
+// therefore before any other threads can get started.
+static const winsock_init<>& winsock_init_instance = winsock_init<>(false);
 
 } // namespace detail
 } // namespace asio
 } // namespace boost
 
-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-
 #include <boost/asio/detail/pop_options.hpp>
 
+#if defined(BOOST_ASIO_HEADER_ONLY)
+# include <boost/asio/detail/impl/winsock_init.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+
+#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+
 #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP