2007-11-22 Paolo Carlini <pcarlini@suse.de>

	* include/bits/stl_tree.h (_Rb_tree<>::_Rb_tree_impl<, true>): Remove,
	identical in mainline to the primary template.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130355 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b9783ac..943f27c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-22  Paolo Carlini  <pcarlini@suse.de>
 
+       * include/bits/stl_tree.h (_Rb_tree<>::_Rb_tree_impl<, true>): Remove,
+       identical in mainline to the primary template.
+
+2007-11-22  Paolo Carlini  <pcarlini@suse.de>
+
        * config/abi/pre/gnu.ver: Adjust new exports for 128-bit long double.
 
 2007-11-22  Johannes Singler  <singler@ira.uka.de>

diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 2503c03..d922a6d 100644 (file)
--- 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<typename _Key_compare>
-        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: