summaryrefslogtreecommitdiff
path: root/boost/container/container_fwd.hpp
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:12:59 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:12:59 +0900
commitb8cf34c691623e4ec329053cbbf68522a855882d (patch)
tree34da08632a99677f6b79ecb65e5b655a5b69a67f /boost/container/container_fwd.hpp
parent3fdc3e5ee96dca5b11d1694975a65200787eab86 (diff)
downloadboost-b8cf34c691623e4ec329053cbbf68522a855882d.tar.gz
boost-b8cf34c691623e4ec329053cbbf68522a855882d.tar.bz2
boost-b8cf34c691623e4ec329053cbbf68522a855882d.zip
Imported Upstream version 1.67.0upstream/1.67.0
Diffstat (limited to 'boost/container/container_fwd.hpp')
-rw-r--r--boost/container/container_fwd.hpp35
1 files changed, 7 insertions, 28 deletions
diff --git a/boost/container/container_fwd.hpp b/boost/container/container_fwd.hpp
index e85a6ce952..e4fe6f85c3 100644
--- a/boost/container/container_fwd.hpp
+++ b/boost/container/container_fwd.hpp
@@ -67,7 +67,7 @@ namespace detail{
//Create namespace to avoid compilation errors
}}}
-namespace boost{ namespace container{ namespace container_detail{
+namespace boost{ namespace container{ namespace dtl{
namespace bi = boost::intrusive;
namespace bid = boost::intrusive::detail;
}}}
@@ -88,23 +88,14 @@ namespace boost{ namespace container{ namespace pmr{
namespace boost {
namespace container {
-//! Enumeration used to configure ordered associative containers
-//! with a concrete tree implementation.
-enum tree_type_enum
-{
- red_black_tree,
- avl_tree,
- scapegoat_tree,
- splay_tree
-};
-
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
template<class T>
class new_allocator;
template <class T
- ,class Allocator = new_allocator<T> >
+ ,class Allocator = new_allocator<T>
+ ,class Options = void>
class vector;
template <class T
@@ -130,35 +121,30 @@ template <class T
,class Allocator = new_allocator<T> >
class slist;
-template<tree_type_enum TreeType, bool OptimizeSize>
-struct tree_opt;
-
-typedef tree_opt<red_black_tree, true> tree_assoc_defaults;
-
template <class Key
,class Compare = std::less<Key>
,class Allocator = new_allocator<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void>
class set;
template <class Key
,class Compare = std::less<Key>
,class Allocator = new_allocator<Key>
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
class multiset;
template <class Key
,class T
,class Compare = std::less<Key>
,class Allocator = new_allocator<std::pair<const Key, T> >
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
class map;
template <class Key
,class T
,class Compare = std::less<Key>
,class Allocator = new_allocator<std::pair<const Key, T> >
- ,class Options = tree_assoc_defaults >
+ ,class Options = void >
class multimap;
template <class Key
@@ -246,13 +232,6 @@ class synchronized_pool_resource;
} //namespace pmr {
-#else
-
-//! Default options for tree-based associative containers
-//! - tree_type<red_black_tree>
-//! - optimize_size<true>
-typedef implementation_defined tree_assoc_defaults;
-
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
//! Type used to tag that the input range is