mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-20 02:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
François Dumont 2016-12-14 20:50:07 +00:00
parent 964b79eb33
commit b958889311
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
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>
* python/libstdcxx/v6/printers.py (num_elements): New function.

8
libstdc++-v3/include/bits/stl_tree.h
View File

@ -685,6 +685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }
#else
_Rb_tree_impl() = default;
_Rb_tree_impl(_Rb_tree_impl&&) = default;
#endif
_Rb_tree_impl(const _Rb_tree_impl& __x)
@ -692,8 +693,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
, _Base_key_compare(__x._M_key_compare)
{ }
#if __cplusplus >= 201103L
_Rb_tree_impl(_Rb_tree_impl&&) = default;
#if __cplusplus < 201103L
_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)
: _Node_allocator(std::move(__a)), _Base_key_compare(__comp)
{ }