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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0179b15feb26e59c19423a74d14e7ab8c0ce8bf4..37f6e32bf075c7f5c59ec3c4c1a80e801c5f242c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
        * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Use

diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h
index 4316af72bf0a50cdf952b672225d06b46072250a..93bd15248f0a64cc9137297f2b4cf5fe6be2345a 100644 (file)
--- a/libstdc++-v3/include/ext/ropeimpl.h
+++ b/libstdc++-v3/include/ext/ropeimpl.h
@@ -1117,7 +1117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          printf("NULL\n");
          return;
        }
-      if (_S_concat == __r->_M_tag)
+      if (__detail::_S_concat == __r->_M_tag)
        {
          _RopeConcatenation* __c = (_RopeConcatenation*)__r;
          _RopeRep* __left = __c->_M_left;

diff --git a/libstdc++-v3/testsuite/ext/rope/6.cc b/libstdc++-v3/testsuite/ext/rope/6.cc
new file mode 100644 (file)
index 0000000..77fdc0a
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/rope/6.cc
@@ -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();
+}