From: Pedro Alves <palves@redhat.com>
Date: Sat, 28 Nov 2015 16:39:32 +0000 (+0000)
Subject: Adjust GDB to demangler API change
X-Git-Tag: gdb-7.10.1-release~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a2752c7f09d24865b33fedd9ac2585f3cbba3c3;p=thirdparty%2Fbinutils-gdb.git

Adjust GDB to demangler API change

Before commit 3a8724032abf, DEMANGLE_COMPONENT_CAST was used for both
casts and conversion operators.  We now have
DEMANGLE_COMPONENT_CONVERSION for the latter.

gdb/ChangeLog:
2014-11-28  Pedro Alves  <palves@redhat.com>

	* cp-name-parser.y (conversion_op): Use
	DEMANGLE_COMPONENT_CONVERSION instead of DEMANGLE_COMPONENT_CAST.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f2b395f10e0..0430b1fefb7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-28  Pedro Alves  <palves@redhat.com>
+
+	* cp-name-parser.y (conversion_op): Use
+	DEMANGLE_COMPONENT_CONVERSION instead of DEMANGLE_COMPONENT_CAST.
+
 2015-11-26  Markus Metzger  <markus.t.metzger@intel.com>
 
 	PR 19297
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index b4690ea497b..43e52a3cb7d 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -528,7 +528,7 @@ oper	:	OPERATOR NEW
 		   since it's not clear that it's parseable.  */
 conversion_op
 		:	OPERATOR typespec_2
-			{ $$ = fill_comp (DEMANGLE_COMPONENT_CAST, $2, NULL); }
+			{ $$ = fill_comp (DEMANGLE_COMPONENT_CONVERSION, $2, NULL); }
 		;
 
 conversion_op_name