Ticket #10174: boost_asio_call_stack_static_storage_win32.patch

boost/asio/detail/call_stack.hpp

@@ -19 +19 @@
 #include <boost/asio/detail/noncopyable.hpp>
 #include <boost/asio/detail/tss_ptr.hpp>
 
+// HACK to only export symbol on windows since gcc doesn't like this for inlines
+#if defined(BOOST_ASIO_WINDOWS)
+#define BOOST_ASIO_DECL_WINDOWS BOOST_ASIO_DECL
+#else
+#define BOOST_ASIO_DECL_WINDOWS
+#endif
+
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
@@ -111 +118 @@
 
 private:
   // The top of the stack of calls for the current thread.
-  static tss_ptr<context> top_;
+  BOOST_ASIO_DECL_WINDOWS static tss_ptr<context> top_;
 };
 
-template <typename Key, typename Value>
-tss_ptr<typename call_stack<Key, Value>::context>
-call_stack<Key, Value>::top_;
-
 } // namespace detail
 } // namespace asio
 } // namespace boost
 
 #include <boost/asio/detail/pop_options.hpp>
 
+#if defined(BOOST_ASIO_HEADER_ONLY)
+# include <boost/asio/detail/call_stack.ipp>
+#endif // defined(BOOST_ASIO_HEADER_ONLY)
+
 #endif // BOOST_ASIO_DETAIL_CALL_STACK_HPP

boost/asio/detail/call_stack.ipp

@@ +1 @@
+//
+// detail/call_stack.ipp
+// ~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2013 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)
+//
+
+#ifndef BOOST_ASIO_DETAIL_CALL_STACK_IPP
+#define BOOST_ASIO_DETAIL_CALL_STACK_IPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+
+#include <boost/asio/detail/call_stack.hpp>
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+template <typename Key, typename Value>
+tss_ptr<typename call_stack<Key, Value>::context>
+BOOST_ASIO_DECL_WINDOWS call_stack<Key, Value>::top_;
+
+} // namespace detail
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // BOOST_ASIO_DETAIL_CALL_STACK_IPP

boost/asio/impl/src.hpp

@@ -23 +23 @@
 #include <boost/asio/impl/handler_alloc_hook.ipp>
 #include <boost/asio/impl/io_service.ipp>
 #include <boost/asio/impl/serial_port_base.ipp>
+#include <boost/asio/detail/call_stack.ipp>
 #include <boost/asio/detail/impl/buffer_sequence_adapter.ipp>
 #include <boost/asio/detail/impl/descriptor_ops.ipp>
 #include <boost/asio/detail/impl/dev_poll_reactor.ipp>