diff options
author | Keith Seitz <keiths@redhat.com> | 2015-08-13 09:48:12 -0700 |
---|---|---|
committer | Keith Seitz <keiths@redhat.com> | 2015-08-13 09:48:12 -0700 |
commit | 67994074671a31e3d2fb78f6036f38095211ac49 (patch) | |
tree | 8ecdf5ca542151595bcdee36c8dcf63619cc0318 /gdb/mi | |
parent | 8efa2874ab298f3923f4127340da119435f87c39 (diff) | |
download | gdb-67994074671a31e3d2fb78f6036f38095211ac49.zip gdb-67994074671a31e3d2fb78f6036f38095211ac49.tar.gz gdb-67994074671a31e3d2fb78f6036f38095211ac49.tar.bz2 |
Mass rename `explicit' -> `explicit_loc'.
BuildBot reminded me that "explicit" is a reserved keyword in C++.
This patch simply renames all the (illegal) uses of "explicit". This should
fix the build errors with --enable-build-with-cxx bots.
gdb/ChangeLog
* break-catch-throw.c (re_set_exception_catchpoint) Rename
reserved C++ keyword "explicit" to "explicit_loc".
* breakpoint.c (create_overlay_event_breakpoint)
(create_longjmp_master_breakpoint)
(create_std_terminate_master_breakpoint)
(create_exception_master_breakpoint, update_static_tracepoint):
Rename reserved C++ keyword "explicit" to "explicit_loc".
* completer.c (collect_explicit_location_matches)
(explicit_location_completer): Rename reserved C++ keyword
"explicit" to "explicit_loc".
* linespec.c (struct linespec) <explicit>: Rename to "explicit_loc".
(canonicalize_linespec, create_sals_line_offset)
(convert_linespec_to_sals, convert_explicit_location_to_sals)
(event_location_to_sals, decode_objc): Rename reserved C++ keyword
"explicit" to "explicit_loc".
* location.c (struct event_location) <explicit>: Rename to
"explicit_loc".
(initialize_explicit_location, new_explicit_location)
(explicit_location_to_string_internal, explicit_location_to_linespec):
Rename reserved C++ keyword "explicit" to "explicit_loc".
* location.h (explicit_location_to_string)
(explicit_location_to_linespec, initialize_explicit_location)
(new_explicit_location): Rename reserved C++ keyword "explicit"
to "explicit_loc".
* mi/mi-cmd-break.c (mi_cmd_break_insert_1): Rename reserved C++
keyword "explicit" to "explicit_loc".
Diffstat (limited to 'gdb/mi')
-rw-r--r-- | gdb/mi/mi-cmd-break.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 4aded13..74929ed 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -183,7 +183,7 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) struct event_location *location; struct breakpoint_ops *ops; int is_explicit = 0; - struct explicit_location explicit; + struct explicit_location explicit_loc; char *extra_string = NULL; enum opt @@ -216,7 +216,7 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) int oind = 0; char *oarg; - initialize_explicit_location (&explicit); + initialize_explicit_location (&explicit_loc); while (1) { @@ -252,19 +252,19 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) break; case EXPLICIT_SOURCE_OPT: is_explicit = 1; - explicit.source_filename = oarg; + explicit_loc.source_filename = oarg; break; case EXPLICIT_FUNC_OPT: is_explicit = 1; - explicit.function_name = oarg; + explicit_loc.function_name = oarg; break; case EXPLICIT_LABEL_OPT: is_explicit = 1; - explicit.label_name = oarg; + explicit_loc.label_name = oarg; break; case EXPLICIT_LINE_OPT: is_explicit = 1; - explicit.line_offset = linespec_parse_line_offset (oarg); + explicit_loc.line_offset = linespec_parse_line_offset (oarg); break; } } @@ -330,14 +330,14 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc) { /* Error check -- we must have one of the other parameters specified. */ - if (explicit.source_filename != NULL - && explicit.function_name == NULL - && explicit.label_name == NULL - && explicit.line_offset.sign == LINE_OFFSET_UNKNOWN) + if (explicit_loc.source_filename != NULL + && explicit_loc.function_name == NULL + && explicit_loc.label_name == NULL + && explicit_loc.line_offset.sign == LINE_OFFSET_UNKNOWN) error (_("-%s-insert: --source option requires --function, --label," " or --line"), dprintf ? "dprintf" : "break"); - location = new_explicit_location (&explicit); + location = new_explicit_location (&explicit_loc); } else { |