rework

Author: MungoG

include/boost/http_proto/server/basic_router.hpp

@@ -131,17 +131,6 @@ struct router_options
     unsigned int v_ = 0;
 };
 
-//-----------------------------------------------
-
-#ifdef __APPLE__
-namespace detail {
-// The Apple linker has a bug whereby it can erroneously deduplicate functions
-// with identical codegen even though the unwind tables are different. This is
-// required as part of a workaround to that issue.
-extern volatile int apple_linker_bug_workaround_;
-} // detail
-#endif // APPLE
-
 //-----------------------------------------------
 
 //namespace detail {
@@ -1025,7 +1014,8 @@ class basic_router : public /*detail::*/any_router
                 // deduplicate functions with identical codegen even though the
                 // unwind tables are different. Here we force different codegen
                 // depending on the type of E.
-                if(detail::apple_linker_bug_workaround_)
+                static volatile int apple_linker_bug_workaround_ = 0;
+                if(apple_linker_bug_workaround_)
                     throw ex;
 #endif // APPLE
                 set_resume u(p_);

src/server/basic_router.cpp

@@ -22,15 +22,6 @@
 namespace boost {
 namespace http_proto {
 
-#ifdef __APPLE__
-namespace detail {
-// The Apple linker has a bug whereby it can erroneously deduplicate functions
-// with identical codegen even though the unwind tables are different. This is
-// required as part of a workaround to that issue.
-BOOST_SYMBOL_VISIBLE volatile int apple_linker_bug_workaround_ = 0;
-} // detail
-#endif // APPLE
-
 //namespace detail {
 
 // VFALCO Temporarily here until Boost.URL merges the fix