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

Fixes #148 (Fix static initialization issues in pmr global resources)

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-05-23 23:38:58 +02:00
parent f73fb1442a
commit 093467e1d3
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/container.qbk
View File

@@ -1319,6 +1319,13 @@ use [*Boost.Container]? There are several reasons for that:
[section:release_notes Release Notes]
[section:release_notes_boost_1_74_00 Boost 1.74 Release]
* Fixed bugs:
* [@https://github.com/boostorg/container/pull/148 GitHub #148: ['"Fix static initialization issues in pmr global resources"]].
[endsect]
[section:release_notes_boost_1_73_00 Boost 1.73 Release]
* Fixed bugs:

12
src/global_resource.cpp
View File

@@ -14,6 +14,7 @@
#include <boost/core/no_exceptions_support.hpp>
#include <boost/container/throw_exception.hpp>
#include <boost/container/detail/dlmalloc.hpp> //For global lock
#include <boost/container/detail/singleton.hpp>
#include <cstddef>
#include <new>
@@ -38,7 +39,7 @@ class new_delete_resource_imp
virtual bool do_is_equal(const memory_resource& other) const BOOST_NOEXCEPT
{ return &other == this; }
} new_delete_resource_instance;
};
struct null_memory_resource_imp
: public memory_resource
@@ -60,19 +61,20 @@ struct null_memory_resource_imp
virtual bool do_is_equal(const memory_resource& other) const BOOST_NOEXCEPT
{ return &other == this; }
} null_memory_resource_instance;
};
BOOST_CONTAINER_DECL memory_resource* new_delete_resource() BOOST_NOEXCEPT
{
return &new_delete_resource_instance;
return &boost::container::dtl::singleton_default<new_delete_resource_imp>::instance();
}
BOOST_CONTAINER_DECL memory_resource* null_memory_resource() BOOST_NOEXCEPT
{
return &null_memory_resource_instance;
return &boost::container::dtl::singleton_default<null_memory_resource_imp>::instance();
}
static memory_resource *default_memory_resource = &new_delete_resource_instance;
static memory_resource *default_memory_resource =
&boost::container::dtl::singleton_default<new_delete_resource_imp>::instance();
BOOST_CONTAINER_DECL memory_resource* set_default_resource(memory_resource* r) BOOST_NOEXCEPT
{