This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Rename `typename' in d-exp.y to avoid C++ reserved word
- From: Keith Seitz <kseitz at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 15 Aug 2015 00:35:45 -0000
- Subject: [binutils-gdb] Rename `typename' in d-exp.y to avoid C++ reserved word
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b56ccc202ab674998baf52a710d736702734f9ab
commit b56ccc202ab674998baf52a710d736702734f9ab
Author: Keith Seitz <keiths@redhat.com>
Date: Fri Aug 14 17:28:11 2015 -0700
Rename `typename' in d-exp.y to avoid C++ reserved word
A recent patch introduced a variable named `typename' into d-exp.y,
and one of the --enable-with-cxx build slaves consequently failed to compile
this. This patch simply adds an underscore into the name to avoid the
reserved word.
gdb/ChangeLog
* d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Rename
`typename' to `type_name' to avoid C++ reserved word.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/d-exp.y | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b604fd..d699070 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-08-14 Keith Seitz <keiths@redhat.com>
+ * d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Rename
+ `typename' to `type_name' to avoid C++ reserved word.
+
+2015-08-14 Keith Seitz <keiths@redhat.com>
+
* location.c (EL_TYPE, EL_LINESPEC, EL_PROBE, EL_ADDRESS)
(EL_EXPLICIT, EL_STRING): Change macro parameter to "P" to
silence ARI errors.
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index e23a0aa..e9d21ac 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -522,12 +522,12 @@ PrimaryExpression:
{
struct bound_minimal_symbol msymbol;
struct block_symbol sym;
- const char *typename = TYPE_SAFE_NAME (type);
- int typename_len = strlen (typename);
+ const char *type_name = TYPE_SAFE_NAME (type);
+ int type_name_len = strlen (type_name);
char *name;
name = xstrprintf ("%.*s.%.*s",
- typename_len, typename,
+ type_name_len, type_name,
$3.length, $3.ptr);
make_cleanup (xfree, name);