stl_tree.h (_Rb_tree_impl(const _Key_compare&, const _Node_allocator&): Restore befor...

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5d7563f602124f60d266f80f6f25145a3159502c..20af4afc606ee6e993fb352dd761691fabf17960 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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.

diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 86d26d5d557cfc9062c5947c1fbfbcf1fe3ca3be..925066cf4720f827ddb1998d5d0f6644fdd46d49 100644 (file)
--- 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)
          { }