diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2016-12-14 20:50:07 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2016-12-14 20:50:07 +0000 |
| commit | b9588893117693dc4a889fb29a4df10f2ea76167 (patch) | |
| tree | 2c97cbbe2c58b0cfa62db7529e4c5abe4d5561b0 | |
| parent | 964b79eb330d5df3e851696e2d0bfa30b0e0307b (diff) | |
| download | gcc-b9588893117693dc4a889fb29a4df10f2ea76167.zip gcc-b9588893117693dc4a889fb29a4df10f2ea76167.tar.gz gcc-b9588893117693dc4a889fb29a4df10f2ea76167.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 5d7563f..20af4af 100644 --- 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 86d26d5..925066c 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) { } |