From 02b27543b7dd41cfd99a726609262759e8b73071 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 22 Nov 2007 18:54:36 +0000 Subject: [PATCH] stl_tree.h (_Rb_tree<>::_Rb_tree_impl<, true>): Remove, identical in mainline to the primary template. 2007-11-22 Paolo Carlini * include/bits/stl_tree.h (_Rb_tree<>::_Rb_tree_impl<, true>): Remove, identical in mainline to the primary template. From-SVN: r130355 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/stl_tree.h | 30 ---------------------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b9783ac1a18..943f27c07e8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-11-22 Paolo Carlini + + * include/bits/stl_tree.h (_Rb_tree<>::_Rb_tree_impl<, true>): Remove, + identical in mainline to the primary template. + 2007-11-22 Paolo Carlini * config/abi/pre/gnu.ver: Adjust new exports for 128-bit long double. diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 2503c030f2c..d922a6db4dd 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -421,36 +421,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } }; - // Specialization for _Comparison types that are not capable of - // being base classes / super classes. - template - struct _Rb_tree_impl<_Key_compare, true> : public _Node_allocator - { - _Key_compare _M_key_compare; - _Rb_tree_node_base _M_header; - size_type _M_node_count; // Keeps track of size of tree. - - _Rb_tree_impl() - : _Node_allocator(), _M_key_compare(), _M_header(), - _M_node_count(0) - { _M_initialize(); } - - _Rb_tree_impl(const _Key_compare& __comp, const _Node_allocator& __a) - : _Node_allocator(__a), _M_key_compare(__comp), _M_header(), - _M_node_count(0) - { _M_initialize(); } - - private: - void - _M_initialize() - { - this->_M_header._M_color = _S_red; - this->_M_header._M_parent = 0; - this->_M_header._M_left = &this->_M_header; - this->_M_header._M_right = &this->_M_header; - } - }; - _Rb_tree_impl<_Compare> _M_impl; protected: