From: John Baldwin <jhb@FreeBSD.org>
To: gdb-patches@sourceware.org
Subject: [PATCH 1/3] Fix mismatched struct vs class tags.
Date: Wed, 23 Nov 2016 20:08:00 -0000 [thread overview]
Message-ID: <20161123200652.89209-2-jhb@FreeBSD.org> (raw)
In-Reply-To: <20161123200652.89209-1-jhb@FreeBSD.org>
The 'collection_list' and 'number_or_range_parser' types were converted
from structs to classes, but some code still used 'struct'. Fix all
references to use 'class' which fixes -Wmismatched-tags warnings issued
by clang.
gdb/ChangeLog:
* breakpoint.h (class number_or_range_parser): Use 'class' instead of
'struct'.
* mi/mi-main.c (mi_cmd_trace_frame_collected): Use
'class collection_list' instead of 'struct collection_list'.
* tracepoint.c (class collection_list): Likewise.
(collection_list::collect_symbol): Likewise.
(encode_actions_1): Likewise.
(encode_actions_rsp): Likewise.
* tracepoint.h (encode_actions): Likewise.
---
gdb/ChangeLog | 12 ++++++++++++
gdb/breakpoint.h | 2 +-
gdb/mi/mi-main.c | 4 ++--
gdb/tracepoint.c | 14 +++++++-------
gdb/tracepoint.h | 4 ++--
5 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a2a11e2..9e8fb4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2016-11-23 John Baldwin <jhb@FreeBSD.org>
+
+ * breakpoint.h (class number_or_range_parser): Use 'class' instead of
+ 'struct'.
+ * mi/mi-main.c (mi_cmd_trace_frame_collected): Use
+ 'class collection_list' instead of 'struct collection_list'.
+ * tracepoint.c (class collection_list): Likewise.
+ (collection_list::collect_symbol): Likewise.
+ (encode_actions_1): Likewise.
+ (encode_actions_rsp): Likewise.
+ * tracepoint.h (encode_actions): Likewise.
+
2016-11-23 Pedro Alves <palves@redhat.com>
* Makefile.in (SFILES): Add common/run-time-clock.c.
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 99133a2..111e37a 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -32,7 +32,7 @@ struct value;
struct block;
struct gdbpy_breakpoint_object;
struct gdbscm_breakpoint_object;
-struct number_or_range_parser;
+class number_or_range_parser;
struct thread_info;
struct bpstats;
struct bp_location;
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 4d276c8..edc1857 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2763,8 +2763,8 @@ mi_cmd_trace_frame_collected (char *command, char **argv, int argc)
struct cleanup *old_chain;
struct bp_location *tloc;
int stepping_frame;
- struct collection_list *clist;
- struct collection_list tracepoint_list, stepping_list;
+ class collection_list *clist;
+ class collection_list tracepoint_list, stepping_list;
struct traceframe_info *tinfo;
int oind = 0;
enum print_values var_print_values = PRINT_ALL_VALUES;
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 7435380..0827f92 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -180,7 +180,7 @@ static void trace_dump_command (char *, int);
/* support routines */
-struct collection_list;
+class collection_list;
static char *mem2hex (gdb_byte *, char *, int);
static struct command_line *
@@ -1079,7 +1079,7 @@ collection_list::collect_symbol (struct symbol *sym,
struct add_local_symbols_data
{
- struct collection_list *collect;
+ class collection_list *collect;
struct gdbarch *gdbarch;
CORE_ADDR pc;
long frame_regno;
@@ -1323,8 +1323,8 @@ encode_actions_1 (struct command_line *action,
struct bp_location *tloc,
int frame_reg,
LONGEST frame_offset,
- struct collection_list *collect,
- struct collection_list *stepping_list)
+ class collection_list *collect,
+ class collection_list *stepping_list)
{
const char *action_exp;
int i;
@@ -1553,8 +1553,8 @@ encode_actions_1 (struct command_line *action,
void
encode_actions (struct bp_location *tloc,
- struct collection_list *tracepoint_list,
- struct collection_list *stepping_list)
+ class collection_list *tracepoint_list,
+ class collection_list *stepping_list)
{
struct command_line *actions;
int frame_reg;
@@ -1578,7 +1578,7 @@ void
encode_actions_rsp (struct bp_location *tloc, char ***tdp_actions,
char ***stepping_actions)
{
- struct collection_list tracepoint_list, stepping_list;
+ class collection_list tracepoint_list, stepping_list;
*tdp_actions = NULL;
*stepping_actions = NULL;
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 36eeee6..dfb85c8 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -323,8 +323,8 @@ void free_actions (struct breakpoint *);
extern const char *decode_agent_options (const char *exp, int *trace_string);
extern void encode_actions (struct bp_location *tloc,
- struct collection_list *tracepoint_list,
- struct collection_list *stepping_list);
+ class collection_list *tracepoint_list,
+ class collection_list *stepping_list);
extern void encode_actions_rsp (struct bp_location *tloc,
char ***tdp_actions, char ***stepping_actions);
--
2.9.2
next prev parent reply other threads:[~2016-11-23 20:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 20:07 [PATCH 0/3] Fix various C++ related clang warnings John Baldwin
2016-11-23 20:08 ` [PATCH 2/3] Add noexcept to custom non-throwing new operators John Baldwin
2016-11-24 17:03 ` Pedro Alves
2016-11-23 20:08 ` [PATCH 3/3] Do not use std::move when assigning an anonymous object to a unique_ptr John Baldwin
2016-11-23 21:19 ` Simon Marchi
2016-11-23 23:31 ` John Baldwin
2016-11-24 0:08 ` Simon Marchi
2016-11-24 16:52 ` Pedro Alves
2016-11-23 20:08 ` John Baldwin [this message]
2016-11-23 20:58 ` [PATCH 1/3] Fix mismatched struct vs class tags Simon Marchi
2016-11-23 23:23 ` John Baldwin
2016-11-24 17:02 ` Pedro Alves
2016-11-24 17:47 ` John Baldwin
2016-11-24 18:50 ` Pedro Alves
2016-11-24 19:15 ` John Baldwin
2016-11-30 11:39 ` Pedro Alves
2016-11-30 16:23 ` John Baldwin
2016-11-30 16:38 ` Pedro Alves
2016-11-30 16:52 ` Simon Marchi
2016-11-30 16:51 ` Simon Marchi
2016-11-30 17:08 ` Pedro Alves
2016-11-30 17:54 ` Simon Marchi
2016-11-30 17:59 ` Eli Zaretskii
2016-11-23 22:18 ` [PATCH 0/3] Fix various C++ related clang warnings Simon Marchi
2016-11-23 23:23 ` John Baldwin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161123200652.89209-2-jhb@FreeBSD.org \
--to=jhb@freebsd.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox