boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from georgthegreat/patch-1

Browse Source 
Fix using pmr::polymorphic_allocator in pre-main
This commit is contained in:
Ion Gaztañaga
2022-12-11 18:45:37 +01:00
committed by GitHub
parent ef3c4f41ce 488500ed85
commit 5e76b844a2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/global_resource.cpp
View File

@@ -127,17 +127,19 @@ namespace boost {
namespace container { namespace container {
namespace pmr { namespace pmr {
static std::atomic<memory_resource*> default_memory_resource = std::atomic<memory_resource*>& default_memory_resource_instance() {
ATOMIC_VAR_INIT(&boost::container::dtl::singleton_default<new_delete_resource_imp>::instance()); static std::atomic<memory_resource*> instance = new_delete_resource();
return instance;
}
BOOST_CONTAINER_DECL memory_resource* set_default_resource(memory_resource* r) BOOST_NOEXCEPT BOOST_CONTAINER_DECL memory_resource* set_default_resource(memory_resource* r) BOOST_NOEXCEPT
{ {
memory_resource *const res = r ? r : new_delete_resource(); memory_resource *const res = r ? r : new_delete_resource();
return default_memory_resource.exchange(res, std::memory_order_acq_rel); return default_memory_resource_instance().exchange(res, std::memory_order_acq_rel);
} }
BOOST_CONTAINER_DECL memory_resource* get_default_resource() BOOST_NOEXCEPT BOOST_CONTAINER_DECL memory_resource* get_default_resource() BOOST_NOEXCEPT
{ return default_memory_resource.load(std::memory_order_acquire); } { return default_memory_resource_instance().load(std::memory_order_acquire); }
#endif #endif