aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2015-08-14 17:28:11 -0700
committerKeith Seitz <keiths@redhat.com>2015-08-14 17:28:11 -0700
commitb56ccc202ab674998baf52a710d736702734f9ab (patch)
tree012c3de88927a803522c4a5311d4bceccbc4a8c6
parenta057aa3c457ba38ca25ff1ed13a30c629bb0f259 (diff)
downloadfsf-binutils-gdb-b56ccc202ab674998baf52a710d736702734f9ab.zip
fsf-binutils-gdb-b56ccc202ab674998baf52a710d736702734f9ab.tar.gz
fsf-binutils-gdb-b56ccc202ab674998baf52a710d736702734f9ab.tar.bz2
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.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/d-exp.y6
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);