boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 20:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the stdcat mutex into init_stdcat() as a local static to fix msvc-12.0

Browse Source
This commit is contained in:
Peter Dimov
2023-01-20 01:22:42 +02:00
parent 8449c62162
commit 71ee26c188
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/system/detail/error_category_impl.hpp
View File

@ -106,18 +106,6 @@ namespace boost
namespace system namespace system
{ {
namespace detail
{
template<class = void> struct stdcat_mx_holder
{
static mutex mx_;
};
template<class T> mutex stdcat_mx_holder<T>::mx_;
} // namespace detail
inline void error_category::init_stdcat() const inline void error_category::init_stdcat() const
{ {
static_assert( sizeof( stdcat_ ) >= sizeof( boost::system::detail::std_category ), "sizeof(stdcat_) is not enough for std_category" ); static_assert( sizeof( stdcat_ ) >= sizeof( boost::system::detail::std_category ), "sizeof(stdcat_) is not enough for std_category" );
@ -130,7 +118,13 @@ inline void error_category::init_stdcat() const
#endif #endif
system::detail::lock_guard<system::detail::mutex> lk( system::detail::stdcat_mx_holder<>::mx_ ); // detail::mutex has a constexpr default constructor,
// and therefore guarantees static initialization, on
// everything except VS 2013 (msvc-12.0)
static system::detail::mutex mx_;
system::detail::lock_guard<system::detail::mutex> lk( mx_ );
if( sc_init_.load( std::memory_order_acquire ) == 0 ) if( sc_init_.load( std::memory_order_acquire ) == 0 )
{ {