darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename `typename' in d-exp.y to avoid C++ reserved word

Browse source 
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.
This commit is contained in:
Keith Seitz 2015-08-14 17:28:11 -07:00
parent a057aa3c45
commit b56ccc202a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
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)

6
gdb/d-exp.y
View file

@ -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);