From: Georeth Chow <georeth2010@gmail.com>
Date: Mon, 25 Jul 2016 12:56:12 +0000 (+0000)
Subject: Fix missing qualification in <ext/rope>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a837417c79ae71cdc8a19c3f2d44317d8d39c32c;p=gcc.git

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 0179b15feb2..37f6e32bf07 100644
--- 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 4316af72bf0..93bd15248f0 100644
--- 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
index 00000000000..77fdc0a4fa1
--- /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();
+}