Remove BOOST_SYSTEM_REQUIRE_CONST_INIT; variables are constexpr, so no longer needed. Closes #45.

system_error_test: Enable locale query on MinGW-w64

.travis.yml

@@ -1,4 +1,4 @@
-# Copyright 2016, 2017, 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)
 
@@ -6,8 +6,6 @@ language: cpp
 
 sudo: false
 
-python: "2.7"
-
 branches:
   only:
     - master
@@ -109,7 +107,7 @@ matrix:
 
     - os: linux
       compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
@@ -320,6 +318,17 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-6.0
 
+    - os: linux
+      compiler: clang++-7
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-7
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
     - os: linux
       compiler: clang++-6.0
       env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
@@ -352,13 +361,20 @@ matrix:
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
 
+    - os: linux
+      compiler: g++
+      env: CMAKE_SUBDIR_TEST=1
+      script:
+      - cd libs/system/test/cmake_subdir_test && mkdir __build__ && cd __build__
+      - cmake ..
+      - cmake --build .
+      - cmake --build . --target check
+
 install:
   - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..
   - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
   - cp -r $TRAVIS_BUILD_DIR/* libs/system
   - python tools/boostdep/depinst/depinst.py system

CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright 2018 Mike Dev
+# 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
+
+# Partial (add_subdirectory only) and experimental CMake support
+# Subject to change; please do not rely on the contents of this file yet
+
+cmake_minimum_required(VERSION 3.5)
+project(BoostSystem LANGUAGES CXX)
+
+add_library(boost_system INTERFACE)
+add_library(Boost::system ALIAS boost_system)
+
+target_include_directories(boost_system INTERFACE include)
+
+target_link_libraries(boost_system
+    INTERFACE
+        Boost::config
+        Boost::winapi
+)

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
@@ -46,10 +46,8 @@ install:
   - cd ..
   - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system\
   - python tools/boostdep/depinst/depinst.py system
   - cmd /c bootstrap
   - b2 -d0 headers

doc/system/reference.adoc

@@ -626,7 +626,7 @@ constexpr explicit operator bool() const noexcept;
 [none]
 * {blank}
 +
-Returns: :: `failed()`.
+Returns: :: `val_ != 0`.
 
 ```
 operator std::error_code() const;
@@ -789,7 +789,7 @@ constexpr explicit operator bool() const noexcept;
 [none]
 * {blank}
 +
-Returns: :: `failed()`.
+Returns: :: `val_ != 0`.
 
 ```
 operator std::error_condition() const;

include/boost/system/detail/config.hpp

@@ -22,6 +22,11 @@
 # undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
 #endif
 
+#if defined(BOOST_NO_CXX11_HDR_MUTEX)
+// Required for thread-safe map manipulation
+# undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
+#endif
+
 // BOOST_SYSTEM_NOEXCEPT
 // Retained for backward compatibility
 
@@ -43,15 +48,4 @@
 # define BOOST_SYSTEM_CONSTEXPR
 #endif
 
-// BOOST_SYSTEM_REQUIRE_CONST_INIT
-
-#define BOOST_SYSTEM_REQUIRE_CONST_INIT
-
-#if defined(__has_cpp_attribute)
-#if __has_cpp_attribute(clang::require_constant_initialization)
-# undef BOOST_SYSTEM_REQUIRE_CONST_INIT
-# define BOOST_SYSTEM_REQUIRE_CONST_INIT [[clang::require_constant_initialization]]
-#endif
-#endif
-
 #endif // BOOST_SYSTEM_DETAIL_CONFIG_HPP_INCLUDED

include/boost/system/detail/std_interoperability.hpp

@@ -10,6 +10,7 @@
 #include <system_error>
 #include <map>
 #include <memory>
+#include <mutex>
 
 //
 
@@ -30,8 +31,20 @@ private:
 
 public:
 
-    explicit std_category( boost::system::error_category const * pc ): pc_( pc )
+    explicit std_category( boost::system::error_category const * pc, unsigned id ): pc_( pc )
     {
+        if( id != 0 )
+        {
+#if defined(_MSC_VER) && defined(_CPPLIB_VER) && _MSC_VER >= 1900 && _MSC_VER < 2000
+
+            // Poking into the protected _Addr member of std::error_category
+            // is not a particularly good programming practice, but what can
+            // you do
+
+            _Addr = id;
+
+#endif
+        }
     }
 
     virtual const char * name() const BOOST_NOEXCEPT
@@ -53,24 +66,50 @@ 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;
+
+struct cat_ptr_less
+{
+    bool operator()( boost::system::error_category const * p1, boost::system::error_category const * p2 ) const BOOST_NOEXCEPT
+    {
+        return *p1 < *p2;
+    }
+};
+
 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;
-
-    static map_type map_;
-
-    map_type::iterator i = map_.find( &cat );
-
-    if( i == map_.end() )
+    if( cat == boost::system::system_category() )
     {
-        std::unique_ptr<std_category> p( new std_category( &cat ) );
-
-        std::pair<map_type::iterator, bool> r = map_.insert( map_type::value_type( &cat, std::move( p ) ) );
-
-        i = r.first;
+        static const std_category system_instance( &cat, 0x1F4D7 );
+        return system_instance;
     }
+    else if( cat == boost::system::generic_category() )
+    {
+        static const std_category generic_instance( &cat, 0x1F4D3 );
+        return generic_instance;
+    }
+    else
+    {
+        typedef std::map< boost::system::error_category const *, std::unique_ptr<std_category>, cat_ptr_less > map_type;
 
-    return *i->second;
+        static map_type map_;
+        static std::mutex map_mx_;
+
+        std::lock_guard<std::mutex> guard( map_mx_ );
+
+        map_type::iterator i = map_.find( &cat );
+
+        if( i == map_.end() )
+        {
+            std::unique_ptr<std_category> p( new std_category( &cat, 0 ) );
+
+            std::pair<map_type::iterator, bool> r = map_.insert( map_type::value_type( &cat, std::move( p ) ) );
+
+            i = r.first;
+        }
+
+        return *i->second;
+    }
 }
 
 inline bool std_category::equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT

include/boost/system/detail/system_category_win32.hpp

@@ -81,44 +81,60 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
         return buffer;
     }
 
-#if defined(__GNUC__)
-# define BOOST_SYSTEM_ALLOCA __builtin_alloca
-#else
-# define BOOST_SYSTEM_ALLOCA _alloca
+    boost::winapi::UINT_ const code_page = message_cp_win32();
+
+    int r = 0;
+
+#if !defined(BOOST_NO_ANSI_APIS)
+
+    if( code_page == boost::winapi::CP_ACP_ )
+    {
+        using namespace boost::winapi;
+
+        DWORD_ retval = boost::winapi::FormatMessageA(
+            FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
+            NULL,
+            ev,
+            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
+            buffer,
+            static_cast<DWORD_>( len ),
+            NULL
+        );
+
+        r = static_cast<int>( retval );
+    }
+    else
+
 #endif
 
-    wchar_t * wbuffer = static_cast<wchar_t*>( BOOST_SYSTEM_ALLOCA( len * sizeof( wchar_t ) ) );
-
-#undef BOOST_SYSTEM_ALLOCA
-
-    using namespace boost::winapi;
-
-    DWORD_ retval = boost::winapi::FormatMessageW(
-        FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
-        NULL,
-        ev,
-        MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
-        wbuffer,
-        static_cast<DWORD_>( len ),
-        NULL
-    );
-
-    if( retval == 0 )
     {
-        return unknown_message_win32( ev, buffer, len );
+        using namespace boost::winapi;
+
+        wchar_t * lpMsgBuf = 0;
+
+        DWORD_ retval = boost::winapi::FormatMessageW(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
+            NULL,
+            ev,
+            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
+            (LPWSTR_) &lpMsgBuf,
+            0,
+            NULL
+        );
+
+        if( retval != 0 )
+        {
+            r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, buffer, static_cast<int>( len ), NULL, NULL );
+            boost::winapi::LocalFree( lpMsgBuf );
+            if ( r != 0 ) --r; // exclude null terminator
+        }
     }
 
-    UINT_ const code_page = message_cp_win32();
-
-    int r = boost::winapi::WideCharToMultiByte( code_page, 0, wbuffer, -1, buffer, static_cast<int>( len ), NULL, NULL );
-
     if( r == 0 )
     {
         return unknown_message_win32( ev, buffer, len );
     }
 
-    --r; // exclude null terminator
-
     while( r > 0 && ( buffer[ r-1 ] == '\n' || buffer[ r-1 ] == '\r' ) )
     {
         buffer[ --r ] = 0;

include/boost/system/error_code.hpp

@@ -155,6 +155,10 @@ template<> struct is_error_condition_enum<errc::errc_t>
 };
 
 // class error_category
+#if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 
 #ifdef BOOST_MSVC
 #pragma warning( push )
@@ -314,6 +318,10 @@ public:
 
 } // namespace detail
 
+#if ( defined( BOOST_GCC ) && BOOST_GCC >= 40600 ) || defined( BOOST_CLANG )
+#pragma GCC diagnostic pop
+#endif
+
 // generic_category(), system_category()
 
 #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
@@ -321,14 +329,14 @@ 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{};
+    static constexpr system_error_category system_category_instance{};
+    static constexpr generic_error_category generic_category_instance{};
 };
 
-template<class T> BOOST_SYSTEM_REQUIRE_CONST_INIT constexpr system_error_category cat_holder<T>::system_category_instance;
-template<class T> BOOST_SYSTEM_REQUIRE_CONST_INIT constexpr generic_error_category cat_holder<T>::generic_category_instance;
+template<class T> constexpr system_error_category cat_holder<T>::system_category_instance;
+template<class T> constexpr generic_error_category cat_holder<T>::generic_category_instance;
 
 } // namespace detail
 
@@ -344,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;
@@ -499,7 +511,7 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_;
+        return val_ != 0;
     }
 
 #else
@@ -509,12 +521,12 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_? unspecified_bool_true: 0;
+        return val_ != 0? unspecified_bool_true: 0;
     }
 
     BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT  // true if no error
     {
-        return !failed_;
+        return val_ == 0;
     }
 
 #endif
@@ -640,7 +652,7 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_;
+        return val_ != 0;
     }
 
 #else
@@ -650,12 +662,12 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const  BOOST_NOEXCEPT // true if error
     {
-        return failed_? unspecified_bool_true: 0;
+        return val_ != 0? unspecified_bool_true: 0;
     }
 
     BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT // true if no error
     {
-        return !failed_;
+        return val_ == 0;
     }
 
 #endif

test/Jamfile.v2

@@ -1,7 +1,7 @@
 # Boost System Library test Jamfile
 
 # Copyright Beman Dawes 2003, 2006
-# Copyright 2017, 2018 Peter Dimov
+# Copyright 2017-2019 Peter Dimov
 
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt
@@ -9,118 +9,46 @@
 # See library home page at http://www.boost.org/libs/system
 
 import testing ;
-import os ;
 
-project
-    : requirements
-      <library>/boost/system//boost_system
-    ;
-
-   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 cxx03 ( properties * )
-   {
-      local result ;
-
-      if <toolset>gcc in $(properties)
-      {
-         result = <cxxflags>-std=c++98 ; # 4.4 has no 03
-      }
-      else if <toolset>clang in $(properties)
-      {
-         result = <cxxflags>-std=c++03 ;
-      }
-      else
-      {
-         result = <build>no ;
-      }
-
-      return $(result) ;
-   }
-
-   rule cxx11 ( properties * )
-   {
-      local result ;
-
-      if <toolset>gcc in $(properties)
-      {
-         result = <cxxflags>-std=c++0x ; # 4.6 has no 11
-      }
-      else if <toolset>clang in $(properties)
-      {
-         result = <cxxflags>-std=c++11 ;
-      }
-      else
-      {
-         result = <build>no ;
-      }
-
-      return $(result) ;
-   }
-
-   rule system-run- ( sources + )
-   {
-      local result ;
-
-      result += [ run $(sources) : : : <link>static : $(sources[1]:B)_static ] ;
-      result += [ run $(sources) : : : <link>shared : $(sources[1]:B)_shared ] ;
-      result += [ run $(sources) : : : -<library>/boost/system//boost_system <define>BOOST_ERROR_CODE_HEADER_ONLY : $(sources[1]:B)_header ] ;
-
-      return $(result) ;
-   }
-
-if [ os.environ UBSAN ]
+rule system-run ( sources + )
 {
-   rule system-run ( sources + )
-   {
-      # The 03/11 tests are ODR violations, no point running them under -fsanitize=undefined
-      return [ system-run- $(sources) ] ;
-   }
-}
-else
-{
-   rule system-run ( sources + )
-   {
-      local result = [ system-run- $(sources) ] ;
+    local result ;
 
-      # Test a source file built with -std=c++03 linked with a System library built without -std=c++03
-      result += [ run $(sources) : : : <link>static <conditional>@cxx03 : $(sources[1]:B)_static_03 ] ;
-      result += [ run $(sources) : : : <link>shared <conditional>@cxx03 : $(sources[1]:B)_shared_03 ] ;
+    result += [ run $(sources) ] ;
+    result += [ run $(sources) : : : <library>/boost/system//boost_system <link>static : $(sources[1]:B)_static ] ;
+    result += [ run $(sources) : : : <library>/boost/system//boost_system <link>shared : $(sources[1]:B)_shared ] ;
+    result += [ run $(sources) : : : <define>BOOST_NO_ANSI_APIS : $(sources[1]:B)_no_ansi ] ;
+    result += [ run $(sources) : : : <define>BOOST_SYSTEM_USE_UTF8 : $(sources[1]:B)_utf8 ] ;
 
-      # Test a source file built with -std=c++11 linked with a System library built without -std=c++11
-      result += [ run $(sources) : : : <link>static <conditional>@cxx11 : $(sources[1]:B)_static_11 ] ;
-      result += [ run $(sources) : : : <link>shared <conditional>@cxx11 : $(sources[1]:B)_shared_11 ] ;
-
-      return $(result) ;
-   }
+    return $(result) ;
 }
 
 system-run error_code_test.cpp ;
 system-run error_code_user_test.cpp ;
 system-run system_error_test.cpp ;
 
-run dynamic_link_test.cpp throw_test :  :  : <link>shared : throw_test_shared ;
+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 ;
-
-run header_only_test.cpp : : : -<library>/boost/system//boost_system ;
-run header_only_test.cpp : : : -<library>/boost/system//boost_system <define>BOOST_NO_ANSI_APIS : header_only_test_no_ansi ;
+system-run header_only_test.cpp ;
 
 run config_test.cpp : : : <test-info>always_show_run_output ;
 
-system-run- std_interop_test.cpp ;
+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 ;
 
 system-run before_main_test.cpp ;
 run-fail throws_assign_fail.cpp ;
-system-run- constexpr_test.cpp ;
+system-run constexpr_test.cpp ;
 system-run win32_hresult_test.cpp ;
 
 system-run error_category_test.cpp ;
@@ -128,9 +56,16 @@ system-run generic_category_test.cpp ;
 system-run system_category_test.cpp ;
 system-run after_main_test.cpp ;
 system-run failed_test.cpp ;
-system-run- failed_constexpr_test.cpp ;
+system-run failed_constexpr_test.cpp ;
 
 # Quick (CI) test
 run quick.cpp ;
 
-run quick.cpp : : : <warnings>all <warnings-as-errors>on : warnings_test ;
+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 <define>STD_SINGLE_INSTANCE_SHARED : std_single_instance_lib_shared ;

test/cmake_subdir_test/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright 2018, 2019 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../.. boostorg/system)
+add_subdirectory(../../../assert boostorg/assert)
+add_subdirectory(../../../config boostorg/config)
+add_subdirectory(../../../core boostorg/core)
+add_subdirectory(../../../predef boostorg/predef)
+add_subdirectory(../../../winapi boostorg/winapi)
+
+add_executable(quick ../quick.cpp)
+target_link_libraries(quick Boost::system Boost::core)
+
+enable_testing()
+add_test(quick quick)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/error_code_test.cpp

@@ -197,7 +197,8 @@ int main( int, char ** )
 #if defined(BOOST_WINDOWS_API)
   // Borland appends newline, so just check text
   BOOST_TEST( ec.message().substr(0,13) == "Unknown error" );
-  BOOST_TEST( ec_0_system.message().substr(0,36) == "The operation completed successfully" );
+  // Fails when the language isn't US English
+  // BOOST_TEST( ec_0_system.message().substr(0,36) == "The operation completed successfully" );
 #elif  defined(linux) || defined(__linux) || defined(__linux__)
   // Linux appends value to message as unsigned, so it varies with # of bits
   BOOST_TEST( ec.message().substr(0,13) == "Unknown error" );

test/failed_test.cpp

@@ -123,13 +123,13 @@ template<class Ec> void test()
 
     {
         Ec ec( 0, http_category() );
-        TEST_FAILED( ec );
+        BOOST_TEST( ec.failed() );
 
         ec.assign( 200, http_category() );
-        TEST_NOT_FAILED( ec );
+        BOOST_TEST( !ec.failed() );
 
         ec = Ec( 404, http_category() );
-        TEST_FAILED( ec );
+        BOOST_TEST( ec.failed() );
     }
 
 }

test/std_single_instance_1.cpp

@@ -0,0 +1,40 @@
+
+// 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
+
+#else
+
+EXPORT void lib1_f()
+{
+}
+
+#endif

test/std_single_instance_2.cpp

@@ -0,0 +1,40 @@
+
+// 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
+
+#else
+
+EXPORT void lib2_f()
+{
+}
+
+#endif

test/std_single_instance_test.cpp

@@ -0,0 +1,76 @@
+
+// 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>
+#include <boost/config/helper_macros.hpp>
+
+#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
+
+BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
+int main() {}
+
+#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(__CYGWIN__)
+
+BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, __CYGWIN__" )
+int main() {}
+
+#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && !defined(_MSC_VER)
+
+BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, no _MSC_VER" )
+int main() {}
+
+#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && !defined(_CPPLIB_VER)
+
+BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, no _CPPLIB_VER" )
+int main() {}
+
+#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && (_MSC_VER < 1900 || _MSC_VER >= 2000)
+
+BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, _MSC_VER is " BOOST_STRINGIZE(_MSC_VER) )
+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

test/system_category_test.cpp

@@ -18,6 +18,16 @@
 
 //
 
+#if defined(BOOST_WINDOWS_API) && defined(BOOST_SYSTEM_USE_UTF8)
+
+#include <boost/config/pragma_message.hpp>
+
+BOOST_PRAGMA_MESSAGE( "Skipping test due to BOOST_WINDOWS_API && BOOST_SYSTEM_USE_UTF8" )
+
+int main() {}
+
+#else
+
 #if defined(BOOST_WINDOWS_API)
 
 #include <windows.h>
@@ -90,7 +100,7 @@ static void test_message( sys::error_category const & cat, int ev )
 {
     BOOST_TEST_EQ( cat.message( ev ), sys_strerror( ev ) );
 
-    char buffer[ 2048 ]; // yes, really
+    char buffer[ 4096 ]; // yes, really
     BOOST_TEST_CSTR_EQ( cat.message( ev, buffer, sizeof( buffer ) ), sys_strerror( ev ).c_str() );
 }
 
@@ -100,17 +110,12 @@ int main()
 
     // message
 
-    for( int i = -2; i < 1024; ++i )
-    {
-        test_message( cat, i );
-    }
-
-    test_message( cat, 5810 );
-
-    for( int i = 10000; i < 11032; ++i )
+    for( int i = -2; i < 16000; ++i )
     {
         test_message( cat, i );
     }
 
     return boost::report_errors();
 }
+
+#endif // #if defined(BOOST_WINDOWS_API) && defined(BOOST_SYSTEM_USE_UTF8)

test/system_error_test.cpp

@@ -37,7 +37,7 @@ namespace
     BOOST_TEST( ex.code().category() == system_category() );
 # ifdef BOOST_WINDOWS_API
     LANGID language_id;
-#   if !defined(__MINGW32__) && !defined(__CYGWIN__) && !BOOST_PLAT_WINDOWS_RUNTIME
+#   if !BOOST_PLAT_WINDOWS_RUNTIME
       language_id = ::GetUserDefaultUILanguage();
 #   else
       language_id = 0x0409; // Assume US English

test/warnings_test.cpp

@@ -0,0 +1,42 @@
+
+// Copyright 2017, 2019 Peter Dimov.
+//
+// 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
+
+// See library home page at http://www.boost.org/libs/system
+
+#include <boost/config.hpp>
+
+#if defined( BOOST_GCC ) && BOOST_GCC < 40600
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+#include <boost/system/error_code.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <cerrno>
+
+int main()
+{
+    boost::system::error_category const & bt = boost::system::generic_category();
+
+    int ev = ENOENT;
+
+    boost::system::error_code bc( ev, bt );
+
+    BOOST_TEST_EQ( bc.value(), ev );
+    BOOST_TEST_EQ( &bc.category(), &bt );
+
+    boost::system::error_condition bn = bt.default_error_condition( ev );
+
+    BOOST_TEST_EQ( bn.value(), ev );
+    BOOST_TEST_EQ( &bn.category(), &bt );
+
+    BOOST_TEST( bt.equivalent( ev, bn ) );
+
+    BOOST_TEST( bc == bn );
+
+    return boost::report_errors();
+}