git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing qualification in <ext/rope> 

2016-07-25  Georeth Chow  <georeth2010@gmail.com>

	* include/ext/ropeimpl.h (rope<>::_S_dump(_RopeRep*, int)): Qualify
	_S_concat enumerator.
	* testsuite/ext/rope/6.cc: New test.

From-SVN: r238711
This commit is contained in:
Georeth Chow 2016-07-25 12:56:12 +00:00 committed by Jonathan Wakely
parent 3d339d5ed0
commit a837417c79
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2016-07-25 Georeth Chow <georeth2010@gmail.com>
* include/ext/ropeimpl.h (rope<>::_S_dump(_RopeRep*, int)): Qualify
_S_concat enumerator.
* testsuite/ext/rope/6.cc: New test.
2016-07-25 Jonathan Wakely <jwakely@redhat.com> 2016-07-25 Jonathan Wakely <jwakely@redhat.com>
* testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Use * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Use

2
libstdc++-v3/include/ext/ropeimpl.h
View File

@ -1117,7 +1117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
printf("NULL\n"); printf("NULL\n");
return; return;
} }
if (_S_concat == __r->_M_tag) if (__detail::_S_concat == __r->_M_tag)
{ {
_RopeConcatenation* __c = (_RopeConcatenation*)__r; _RopeConcatenation* __c = (_RopeConcatenation*)__r;
_RopeRep* __left = __c->_M_left; _RopeRep* __left = __c->_M_left;

28
libstdc++-v3/testsuite/ext/rope/6.cc Normal file
View File

@ -0,0 +1,28 @@
// Copyright (C) 2016 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
#include <ext/rope>
// https://gcc.gnu.org/ml/libstdc++/2016-07/msg00114.html
void
test01()
{
__gnu_cxx::crope r(100, 'x');
r.dump();
}