From b56ccc202ab674998baf52a710d736702734f9ab Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Fri, 14 Aug 2015 17:28:11 -0700 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/d-exp.y | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b604fdfc30..d699070d614 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-08-14 Keith Seitz + + * d-exp.y (PrimaryExpression : TypeExp '.' IdentifierExp): Rename + `typename' to `type_name' to avoid C++ reserved word. + 2015-08-14 Keith Seitz * location.c (EL_TYPE, EL_LINESPEC, EL_PROBE, EL_ADDRESS) diff --git a/gdb/d-exp.y b/gdb/d-exp.y index e23a0aaeeae..e9d21ac50d2 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); -- 2.30.2