This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] gdb/ada-lang.c: Rename local variable typename into type_name...
- From: Joel Brobecker <brobecke at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 20 May 2015 07:23:06 -0000
- Subject: [binutils-gdb] gdb/ada-lang.c: Rename local variable typename into type_name...
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1da0522ea716f4c679cc1fe85c39459417ec2749
commit 1da0522ea716f4c679cc1fe85c39459417ec2749
Author: Joel Brobecker <brobecker@adacore.com>
Date: Wed May 20 09:14:30 2015 +0200
gdb/ada-lang.c: Rename local variable typename into type_name...
... to avoid a build failure when building with C++ compiler
(when configured with --enable-build-with-cxx). We cannot use
"typename" as it is a C++ reserved keyword.
gdb/ChangeLog:
* ada-lang.c (to_fixed_array_type): Rename local variable
typename into type_name.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/ada-lang.c | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d7a7cf..2917022 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-20 Joel Brobecker <brobecker@adacore.com>
+
+ * ada-lang.c (to_fixed_array_type): Rename local variable
+ typename into type_name.
+
2015-05-19 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix ASAN crash for gdb.compile/compile.exp.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f789108..782447a 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8582,16 +8582,16 @@ to_fixed_array_type (struct type *type0, struct value *dval,
if (index_type_desc == NULL)
{
- const char *typename = ada_type_name (type0);
+ const char *type_name = ada_type_name (type0);
- if (typename != NULL)
+ if (type_name != NULL)
{
- const int len = strlen (typename);
+ const int len = strlen (type_name);
char *name = (char *) alloca (len + strlen (xa_suffix));
- if (typename[len - 1] == 'P')
+ if (type_name[len - 1] == 'P')
{
- strcpy (name, typename);
+ strcpy (name, type_name);
strcpy (name + len - 1, xa_suffix);
index_type_desc = ada_find_parallel_type_with_name (type0, name);
}