diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | 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); |