feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Use map::insert instead of map::emplace, which doesn't work on g++ pre-6 (and msvc-10.0)

Browse Source
This commit is contained in:
Peter Dimov
2018-09-16 05:58:29 +03:00
parent 731df11ffd
commit 57ecfeb2c2
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,6 @@
# define BOOST_SYSTEM_HAS_SYSTEM_ERROR
#endif
#if defined(BOOST_MSVC) && BOOST_MSVC < 1700
// msvc-10.0 has no two-argument map::emplace
# undef BOOST_SYSTEM_HAS_SYSTEM_ERROR
#endif
// BOOST_SYSTEM_NOEXCEPT
// Retained for backward compatibility only

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

@ -9,6 +9,7 @@
#include <system_error>
#include <map>
#include <memory>
//
@ -29,7 +30,7 @@ private:
public:
std_category( boost::system::error_category const * pc ): pc_( pc )
explicit std_category( boost::system::error_category const * pc ): pc_( pc )
{
}
@ -54,13 +55,22 @@ public:
inline std::error_category const & to_std_category( boost::system::error_category const & cat )
{
typedef std::map<boost::system::error_category const *, std_category> map_type;
typedef std::map< boost::system::error_category const *, std::unique_ptr<std_category> > map_type;
static map_type map_;
std::pair<map_type::iterator, bool> p = map_.emplace( &cat, &cat );
map_type::iterator i = map_.find( &cat );
return p.first->second;
if( i == map_.end() )
{
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;
}
return *i->second;
}
inline bool std_category::equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT