[PATCH/obv] Rename `typename' in d-exp.y to avoid C++ reserved word
Commit Message
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(-)
Comments
On 15 August 2015 at 02:36, Keith Seitz <keiths@redhat.com> wrote:
> 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.
>
I'll have to remember to add that to my own builds, thanks.
Iain
On Saturday, August 15 2015, Iain Buclaw wrote:
> On 15 August 2015 at 02:36, Keith Seitz <keiths@redhat.com> wrote:
>> 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.
>>
>
> I'll have to remember to add that to my own builds, thanks.
Good idea, but if you forget, there's a builder in our BuildBot
dedicated only to catch failures when compiling with --enable-with-cxx.
If something fails, the author will be notified via e-mail.
Of course it's always good to check before pushing the changes, but I
thought it was worth mentioning the builder just in case.
@@ -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.
@@ -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);