From ce2f7f53c69a167a5f3211613d6ccd8c80b8856d Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 2 Sep 2004 18:22:20 +0000 Subject: [PATCH] 2004-09-02 Benjamin Kosnik Leland Wang PR libstdc++/17259 * include/ext/ropeimpl.h (rope::_S_compare): Use _Rope_constants::_S_leaf. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86973 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/ext/ropeimpl.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index aff78de..7313217 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,11 @@ 2004-09-02 Benjamin Kosnik + Leland Wang + + PR libstdc++/17259 + * include/ext/ropeimpl.h (rope::_S_compare): Use + _Rope_constants::_S_leaf. + +2004-09-02 Benjamin Kosnik PR libstdc++/16848 * include/Makefile.am (ext_headers): Remove demangle.h. diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 7463196..5187769 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -1438,7 +1438,7 @@ namespace __gnu_cxx if (_Rope_constants::_S_leaf == __left->_M_tag) { _RopeLeaf* __l = (_RopeLeaf*) __left; - if (_RopeRep::_S_leaf == __right->_M_tag) + if (_Rope_constants::_S_leaf == __right->_M_tag) { _RopeLeaf* __r = (_RopeLeaf*) __right; return lexicographical_compare_3way(__l->_M_data, -- 2.7.4