From b9588893117693dc4a889fb29a4df10f2ea76167 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Wed, 14 Dec 2016 20:50:07 +0000 Subject: [PATCH] stl_tree.h (_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore before C++11 mode. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-12-14 François Dumont * include/bits/stl_tree.h (_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore before C++11 mode. From-SVN: r243670 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_tree.h | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5d7563f6021..20af4afc606 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2016-12-14 François Dumont + + * include/bits/stl_tree.h + (_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore + before C++11 mode. + 2016-12-14 Jonathan Wakely * python/libstdcxx/v6/printers.py (num_elements): New function. diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 86d26d5d557..925066cf472 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -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) { } -- 2.30.2