Add BOOST_SYMBOL_VISIBLE to system_category(), generic_category()

appveyor.yml

@@ -1,4 +1,4 @@
-# Copyright 2016-2018 Peter Dimov
+# Copyright 2016-2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -14,28 +14,28 @@ branches:
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0,msvc-14.0
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
       CXXSTD: 14,17
       ADDRMD: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\cygwin\bin;
       TOOLSET: gcc
       CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\cygwin64\bin;
       TOOLSET: gcc
       CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\mingw\bin;
       TOOLSET: gcc
       CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
       TOOLSET: gcc
       CXXSTD: 03,11,14,1z

include/boost/system/detail/std_interoperability.hpp

@@ -53,6 +53,8 @@ public:
     virtual bool equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT;
 };
 
+inline std::error_category const & to_std_category( boost::system::error_category const & cat ) BOOST_SYMBOL_VISIBLE;
+
 inline std::error_category const & to_std_category( boost::system::error_category const & cat )
 {
     typedef std::map< boost::system::error_category const *, std::unique_ptr<std_category> > map_type;

include/boost/system/error_code.hpp

@@ -329,7 +329,7 @@ public:
 namespace detail
 {
 
-template<class T> struct cat_holder
+template<class T> struct BOOST_SYMBOL_VISIBLE cat_holder
 {
     BOOST_SYSTEM_REQUIRE_CONST_INIT static constexpr system_error_category system_category_instance{};
     BOOST_SYSTEM_REQUIRE_CONST_INIT static constexpr generic_error_category generic_category_instance{};
@@ -352,12 +352,16 @@ constexpr error_category const & generic_category() BOOST_NOEXCEPT
 
 #else // #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
 
+inline error_category const & system_category() BOOST_NOEXCEPT BOOST_SYMBOL_VISIBLE;
+
 inline error_category const & system_category() BOOST_NOEXCEPT
 {
     static const detail::system_error_category system_category_instance;
     return system_category_instance;
 }
 
+inline error_category const & generic_category() BOOST_NOEXCEPT BOOST_SYMBOL_VISIBLE;
+
 inline error_category const & generic_category() BOOST_NOEXCEPT
 {
     static const detail::generic_error_category generic_category_instance;

test/Jamfile.v2

@@ -10,11 +10,6 @@
 
 import testing ;
 
-lib throw_test : throw_test.cpp : <link>shared:<define>THROW_DYN_LINK=1 ;
-
-lib single_instance_lib1 : single_instance_1.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
-lib single_instance_lib2 : single_instance_2.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
-
 rule system-run ( sources + )
 {
     local result ;
@@ -32,6 +27,8 @@ system-run error_code_test.cpp ;
 system-run error_code_user_test.cpp ;
 system-run system_error_test.cpp ;
 
+lib throw_test : throw_test.cpp : <link>shared:<define>THROW_DYN_LINK=1 ;
+
 run dynamic_link_test.cpp throw_test : : : <link>shared : throw_test_shared ;
 
 system-run initialization_test.cpp ;
@@ -42,6 +39,9 @@ run config_test.cpp : : : <test-info>always_show_run_output ;
 system-run std_interop_test.cpp ;
 system-run std_mismatch_test.cpp ;
 
+lib single_instance_lib1 : single_instance_1.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
+lib single_instance_lib2 : single_instance_2.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
+
 system-run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp ;
 run single_instance_test.cpp single_instance_lib1 single_instance_lib2 : : : <link>static : single_instance_lib_static ;
 run single_instance_test.cpp single_instance_lib1 single_instance_lib2 : : : <link>shared : single_instance_lib_shared ;
@@ -62,3 +62,10 @@ system-run failed_constexpr_test.cpp ;
 run quick.cpp ;
 
 run warnings_test.cpp : : : <warnings>all <warnings-as-errors>on <toolset>gcc:<cxxflags>-Wnon-virtual-dtor <toolset>clang:<cxxflags>-Wnon-virtual-dtor ;
+
+lib std_single_instance_lib1 : std_single_instance_1.cpp : <link>shared:<define>STD_SINGLE_INSTANCE_DYN_LINK ;
+lib std_single_instance_lib2 : std_single_instance_2.cpp : <link>shared:<define>STD_SINGLE_INSTANCE_DYN_LINK ;
+
+system-run std_single_instance_test.cpp std_single_instance_1.cpp std_single_instance_2.cpp ;
+run std_single_instance_test.cpp std_single_instance_lib1 std_single_instance_lib2 : : : <link>static : std_single_instance_lib_static ;
+run std_single_instance_test.cpp std_single_instance_lib1 std_single_instance_lib2 : : : <link>shared : std_single_instance_lib_shared ;

test/std_single_instance_1.cpp

@@ -0,0 +1,34 @@
+
+// Copyright 2019 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+
+#include <boost/config.hpp>
+
+#if defined(STD_SINGLE_INSTANCE_DYN_LINK)
+# define EXPORT BOOST_SYMBOL_EXPORT
+#else
+# define EXPORT
+#endif
+
+#include <boost/system/error_code.hpp>
+
+#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
+
+#include <system_error>
+
+namespace lib1
+{
+
+EXPORT std::error_code get_system_code()
+{
+    return boost::system::error_code( 0, boost::system::system_category() );
+}
+
+EXPORT std::error_code get_generic_code()
+{
+    return boost::system::error_code( 0, boost::system::generic_category() );
+}
+
+} // namespace lib1
+
+#endif

test/std_single_instance_2.cpp

@@ -0,0 +1,34 @@
+
+// Copyright 2019 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+
+#include <boost/config.hpp>
+
+#if defined(STD_SINGLE_INSTANCE_DYN_LINK)
+# define EXPORT BOOST_SYMBOL_EXPORT
+#else
+# define EXPORT
+#endif
+
+#include <boost/system/error_code.hpp>
+
+#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
+
+#include <system_error>
+
+namespace lib2
+{
+
+EXPORT std::error_code get_system_code()
+{
+    return boost::system::error_code( 0, boost::system::system_category() );
+}
+
+EXPORT std::error_code get_generic_code()
+{
+    return boost::system::error_code( 0, boost::system::generic_category() );
+}
+
+} // namespace lib2
+
+#endif

test/std_single_instance_test.cpp

@@ -0,0 +1,56 @@
+
+// Copyright 2019 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+
+#include <boost/system/error_code.hpp>
+#include <boost/config/pragma_message.hpp>
+
+#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
+
+BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
+
+int main() {}
+
+#else
+
+#include <boost/core/lightweight_test.hpp>
+#include <system_error>
+
+using namespace boost::system;
+
+namespace lib1
+{
+
+std::error_code get_system_code();
+std::error_code get_generic_code();
+
+} // namespace lib1
+
+namespace lib2
+{
+
+std::error_code get_system_code();
+std::error_code get_generic_code();
+
+} // namespace lib2
+
+int main()
+{
+    {
+        std::error_code e1 = lib1::get_system_code();
+        std::error_code e2 = lib2::get_system_code();
+
+        BOOST_TEST_EQ( e1, e2 );
+    }
+
+    {
+        std::error_code e1 = lib1::get_generic_code();
+        std::error_code e2 = lib2::get_generic_code();
+
+        BOOST_TEST_EQ( e1, e2 );
+    }
+
+    return boost::report_errors();
+}
+
+#endif