Merge pull request #49 from Thomas-Barbier-1A/cpp7_redundant_redeclar_constexpr

Fix c++17 warning redundant redeclaration of 'constexpr' static data

.travis.yml

@@ -6,6 +6,8 @@ language: cpp
 
 sudo: false
 
+dist: trusty
+
 branches:
   only:
     - master
@@ -115,6 +117,16 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
+    - os: linux
+      compiler: g++-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - g++-9
+          sources:
+            - ubuntu-toolchain-r-test
+
     - os: linux
       compiler: g++-8
       env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
@@ -306,18 +318,6 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-6.0
 
-    - os: linux
-      compiler: clang++-6.0
-      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
-      addons:
-        apt:
-          packages:
-            - clang-6.0
-            - libstdc++-4.9-dev
-          sources:
-            - 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
@@ -329,6 +329,17 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-7
 
+    - os: linux
+      compiler: clang++-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-8
+
     - 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

appveyor.yml

@@ -20,7 +20,7 @@ environment:
       TOOLSET: msvc-12.0,msvc-14.0
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
+      TOOLSET: msvc-14.1,clang-win
       CXXSTD: 14,17
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

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
@@ -55,24 +68,48 @@ public:
 
 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

@@ -264,6 +264,7 @@ inline error_condition system_category_default_error_condition_win32( int ev ) B
     case ERROR_CANTOPEN_: return make_error_condition( io_error );
     case ERROR_CANTREAD_: return make_error_condition( io_error );
     case ERROR_CANTWRITE_: return make_error_condition( io_error );
+    case ERROR_CONNECTION_ABORTED_: return make_error_condition( connection_aborted );
     case ERROR_CURRENT_DIRECTORY_: return make_error_condition( permission_denied );
     case ERROR_DEV_NOT_EXIST_: return make_error_condition( no_such_device );
     case ERROR_DEVICE_IN_USE_: return make_error_condition( device_or_resource_busy );

include/boost/system/error_code.hpp

@@ -331,12 +331,15 @@ namespace detail
 
 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;
+// Before C++17 it was mandatory to redeclare all static constexpr
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+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;
+#endif
 
 } // namespace detail
 
@@ -784,7 +787,7 @@ inline std::size_t hash_value( error_code const & ec )
 
     if( id == 0 )
     {
-        id = reinterpret_cast<boost::ulong_long_type>( &cat );
+        id = reinterpret_cast<boost::uintptr_t>( &cat );
     }
 
     boost::ulong_long_type hv = ( boost::ulong_long_type( 0xCBF29CE4 ) << 32 ) + 0x84222325;

test/Jamfile.v2

@@ -68,4 +68,4 @@ lib std_single_instance_lib2 : std_single_instance_2.cpp : <link>shared:<define>
 
 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 ;
+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/std_single_instance_1.cpp

@@ -31,4 +31,10 @@ EXPORT std::error_code get_generic_code()
 
 } // namespace lib1
 
+#else
+
+EXPORT void lib1_f()
+{
+}
+
 #endif

test/std_single_instance_2.cpp

@@ -31,4 +31,10 @@ EXPORT std::error_code get_generic_code()
 
 } // namespace lib2
 
+#else
+
+EXPORT void lib2_f()
+{
+}
+
 #endif

test/std_single_instance_test.cpp

@@ -4,11 +4,31 @@
 
 #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