Commit b9588893 by François Dumont

stl_tree.h (_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore before C++11 mode.

2016-12-14  François Dumont  <fdumont@gcc.gnu.org>

	* include/bits/stl_tree.h
	(_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore
	before C++11 mode.

From-SVN: r243670
parent 964b79eb
2016-12-14 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_tree.h
(_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore
before C++11 mode.
2016-12-14 Jonathan Wakely <jwakely@redhat.com> 2016-12-14 Jonathan Wakely <jwakely@redhat.com>
* python/libstdcxx/v6/printers.py (num_elements): New function. * python/libstdcxx/v6/printers.py (num_elements): New function.
......
...@@ -685,6 +685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -685,6 +685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ } { }
#else #else
_Rb_tree_impl() = default; _Rb_tree_impl() = default;
_Rb_tree_impl(_Rb_tree_impl&&) = default;
#endif #endif
_Rb_tree_impl(const _Rb_tree_impl& __x) _Rb_tree_impl(const _Rb_tree_impl& __x)
...@@ -692,8 +693,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -692,8 +693,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
, _Base_key_compare(__x._M_key_compare) , _Base_key_compare(__x._M_key_compare)
{ } { }
#if __cplusplus >= 201103L #if __cplusplus < 201103L
_Rb_tree_impl(_Rb_tree_impl&&) = default; _Rb_tree_impl(const _Key_compare& __comp, const _Node_allocator& __a)
: _Node_allocator(__a), _Base_key_compare(__comp)
{ }
#else
_Rb_tree_impl(const _Key_compare& __comp, _Node_allocator&& __a) _Rb_tree_impl(const _Key_compare& __comp, _Node_allocator&& __a)
: _Node_allocator(std::move(__a)), _Base_key_compare(__comp) : _Node_allocator(std::move(__a)), _Base_key_compare(__comp)
{ } { }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment