From 35dc4c015a0b6e0558a892bbbcca2cc73e435f61 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 2 Sep 2004 18:22:20 +0000 Subject: [PATCH] re PR libstdc++/17259 (One more _S_leaf incorrectly qualified with _RopeRep:: in ropeimpl.h) 2004-09-02 Benjamin Kosnik Leland Wang PR libstdc++/17259 * include/ext/ropeimpl.h (rope::_S_compare): Use _Rope_constants::_S_leaf. Co-Authored-By: Leland Wang From-SVN: r86973 --- 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 aff78de2436..73132177677 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +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 diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 7463196c0e9..51877699cb5 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.30.2