summaryrefslogtreecommitdiff
path: root/boost/container/pmr
diff options
context:
space:
mode:
Diffstat (limited to 'boost/container/pmr')
-rw-r--r--boost/container/pmr/flat_map.hpp12
-rw-r--r--boost/container/pmr/flat_set.hpp12
-rw-r--r--boost/container/pmr/map.hpp8
-rw-r--r--boost/container/pmr/polymorphic_allocator.hpp4
-rw-r--r--boost/container/pmr/resource_adaptor.hpp2
-rw-r--r--boost/container/pmr/set.hpp8
6 files changed, 19 insertions, 27 deletions
diff --git a/boost/container/pmr/flat_map.hpp b/boost/container/pmr/flat_map.hpp
index 150d5332f2..76c697bac4 100644
--- a/boost/container/pmr/flat_map.hpp
+++ b/boost/container/pmr/flat_map.hpp
@@ -26,14 +26,12 @@ namespace pmr {
template <class Key
,class T
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key > >
using flat_map = boost::container::flat_map<Key, T, Compare, polymorphic_allocator<std::pair<Key, T> > >;
template <class Key
,class T
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
using flat_multimap = boost::container::flat_multimap<Key, T, Compare, polymorphic_allocator<std::pair<Key, T> > >;
#endif
@@ -42,8 +40,7 @@ using flat_multimap = boost::container::flat_multimap<Key, T, Compare, polymorph
//! that uses a polymorphic allocator
template <class Key
,class T
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
struct flat_map_of
{
typedef boost::container::flat_map<Key, T, Compare, polymorphic_allocator<std::pair<Key, T> > > type;
@@ -53,8 +50,7 @@ struct flat_map_of
//! that uses a polymorphic allocator
template <class Key
,class T
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
struct flat_multimap_of
{
typedef boost::container::flat_multimap<Key, T, Compare, polymorphic_allocator<std::pair<Key, T> > > type;
diff --git a/boost/container/pmr/flat_set.hpp b/boost/container/pmr/flat_set.hpp
index 6d4292bfb4..f072c95139 100644
--- a/boost/container/pmr/flat_set.hpp
+++ b/boost/container/pmr/flat_set.hpp
@@ -25,13 +25,11 @@ namespace pmr {
#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template <class Key
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
using flat_set = boost::container::flat_set<Key, Compare, polymorphic_allocator<Key> >;
template <class Key
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
using flat_multiset = boost::container::flat_multiset<Key, Compare, polymorphic_allocator<Key> >;
#endif
@@ -39,8 +37,7 @@ using flat_multiset = boost::container::flat_multiset<Key, Compare, polymorphic_
//! A portable metafunction to obtain a flat_set
//! that uses a polymorphic allocator
template <class Key
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
struct flat_set_of
{
typedef boost::container::flat_set<Key, Compare, polymorphic_allocator<Key> > type;
@@ -49,8 +46,7 @@ struct flat_set_of
//! A portable metafunction to obtain a flat_multiset
//! that uses a polymorphic allocator
template <class Key
- ,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Compare = std::less<Key> >
struct flat_multiset_of
{
typedef boost::container::flat_multiset<Key, Compare, polymorphic_allocator<Key> > type;
diff --git a/boost/container/pmr/map.hpp b/boost/container/pmr/map.hpp
index 165a473373..71821606ae 100644
--- a/boost/container/pmr/map.hpp
+++ b/boost/container/pmr/map.hpp
@@ -27,13 +27,13 @@ namespace pmr {
template <class Key
,class T
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
using map = boost::container::map<Key, T, Compare, polymorphic_allocator<std::pair<const Key, T> >, Options>;
template <class Key
,class T
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
using multimap = boost::container::multimap<Key, T, Compare, polymorphic_allocator<std::pair<const Key, T> >, Options>;
#endif
@@ -43,7 +43,7 @@ using multimap = boost::container::multimap<Key, T, Compare, polymorphic_allocat
template <class Key
,class T
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
struct map_of
{
typedef boost::container::map<Key, T, Compare, polymorphic_allocator<std::pair<const Key, T> >, Options> type;
@@ -54,7 +54,7 @@ struct map_of
template <class Key
,class T
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
struct multimap_of
{
typedef boost::container::multimap<Key, T, Compare, polymorphic_allocator<std::pair<const Key, T> >, Options> type;
diff --git a/boost/container/pmr/polymorphic_allocator.hpp b/boost/container/pmr/polymorphic_allocator.hpp
index c446bc8d5b..8c04653213 100644
--- a/boost/container/pmr/polymorphic_allocator.hpp
+++ b/boost/container/pmr/polymorphic_allocator.hpp
@@ -104,7 +104,7 @@ class polymorphic_allocator
void construct(U* p, BOOST_FWD_REF(Args)...args)
{
new_allocator<U> na;
- container_detail::dispatch_uses_allocator
+ dtl::dispatch_uses_allocator
(na, *this, p, ::boost::forward<Args>(args)...);
}
@@ -117,7 +117,7 @@ class polymorphic_allocator
void construct(U* p BOOST_MOVE_I##N BOOST_MOVE_UREFQ##N)\
{\
new_allocator<U> na;\
- container_detail::dispatch_uses_allocator\
+ dtl::dispatch_uses_allocator\
(na, *this, p BOOST_MOVE_I##N BOOST_MOVE_FWDQ##N);\
}\
//
diff --git a/boost/container/pmr/resource_adaptor.hpp b/boost/container/pmr/resource_adaptor.hpp
index deece632e8..f5ce5c8a18 100644
--- a/boost/container/pmr/resource_adaptor.hpp
+++ b/boost/container/pmr/resource_adaptor.hpp
@@ -57,7 +57,7 @@ class resource_adaptor_imp
void static_assert_if_not_char_allocator() const
{
//This class can only be used with allocators type char
- BOOST_STATIC_ASSERT((container_detail::is_same<typename Allocator::value_type, char>::value));
+ BOOST_STATIC_ASSERT((dtl::is_same<typename Allocator::value_type, char>::value));
}
#endif
diff --git a/boost/container/pmr/set.hpp b/boost/container/pmr/set.hpp
index 04583ce2dd..320169667f 100644
--- a/boost/container/pmr/set.hpp
+++ b/boost/container/pmr/set.hpp
@@ -26,12 +26,12 @@ namespace pmr {
template <class Key
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
using set = boost::container::set<Key, Compare, polymorphic_allocator<Key>, Options>;
template <class Key
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
using multiset = boost::container::multiset<Key, Compare, polymorphic_allocator<Key>, Options>;
#endif
@@ -40,7 +40,7 @@ using multiset = boost::container::multiset<Key, Compare, polymorphic_allocator<
//! that uses a polymorphic allocator
template <class Key
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
struct set_of
{
typedef boost::container::set<Key, Compare, polymorphic_allocator<Key>, Options> type;
@@ -50,7 +50,7 @@ struct set_of
//! that uses a polymorphic allocator
template <class Key
,class Compare = std::less<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
struct multiset_of
{
typedef boost::container::multiset<Key, Compare, polymorphic_allocator<Key>, Options> type;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 07:30:40 +0000