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

Fix thread safety issue in std interop

Browse Source
This commit is contained in:
Peter Dimov
2019-04-25 01:01:48 +03:00
parent e08e4253d0
commit 1d845408dd
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/system/detail/config.hpp
View File

@ -22,6 +22,11 @@
# undef BOOST_SYSTEM_HAS_SYSTEM_ERROR # undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
#endif #endif
#if defined(BOOST_NO_CXX11_HDR_MUTEX)
// Required for thread-safe map manipulation
# undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
#endif
// BOOST_SYSTEM_NOEXCEPT // BOOST_SYSTEM_NOEXCEPT
// Retained for backward compatibility // Retained for backward compatibility

4
include/boost/system/detail/std_interoperability.hpp
View File

@ -10,6 +10,7 @@
#include <system_error> #include <system_error>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex>
// //
@ -92,6 +93,9 @@ inline std::error_category const & to_std_category( boost::system::error_categor
typedef std::map< boost::system::error_category const *, std::unique_ptr<std_category>, cat_ptr_less > map_type; typedef std::map< boost::system::error_category const *, std::unique_ptr<std_category>, cat_ptr_less > map_type;
static map_type map_; static map_type map_;
static std::mutex map_mx_;
std::lock_guard<std::mutex> guard( map_mx_ );
map_type::iterator i = map_.find( &cat ); map_type::iterator i = map_.find( &cat );