From 1da0522ea716f4c679cc1fe85c39459417ec2749 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 20 May 2015 09:14:30 +0200 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6d7a7cf032..291702295a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-05-20 Joel Brobecker + + * ada-lang.c (to_fixed_array_type): Rename local variable + typename into type_name. + 2015-05-19 Jan Kratochvil Fix ASAN crash for gdb.compile/compile.exp. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f7891082ab..782447a6fd 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); }