diff options
| author | Marco Barisione <mbarisione@undo.io> | 2021-05-19 16:48:05 +0100 |
|---|---|---|
| committer | Marco Barisione <mbarisione@undo.io> | 2021-05-19 16:48:05 +0100 |
| commit | 0d7e3cd15fa770e172f442e1a984809fa8ac0fdc (patch) | |
| tree | 51f3f1659368baf375e7c6660947c44c0b44b4cc | |
| parent | 4156e38676b80a5816fde4d5def1bedea6e1c5ab (diff) | |
| download | gdb-0d7e3cd15fa770e172f442e1a984809fa8ac0fdc.zip gdb-0d7e3cd15fa770e172f442e1a984809fa8ac0fdc.tar.gz gdb-0d7e3cd15fa770e172f442e1a984809fa8ac0fdc.tar.bz2 | |
gdb: Move definitions of std::string overloads in ui_out to the header
These methods are just trivial wrappers around the versions accepting
a char pointer. By moving them to the header the compiler can inline
them.
gdb/ChangeLog:
* ui-out.c (ui_out::field_string): Move to ui-out.h.
(ui_out::text): Ditto.
* ui-out.h (class ui_out): Add definitions of
ui_out::field_string and ui_out::text which were previously
defined in ui-out.c.
| -rw-r--r-- | gdb/ui-out.c | 13 | ||||
| -rw-r--r-- | gdb/ui-out.h | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/gdb/ui-out.c b/gdb/ui-out.c index c091af6..982d157 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -527,13 +527,6 @@ ui_out::field_string (const char *fldname, const char *string, do_field_string (fldno, width, align, fldname, string, style); } -void -ui_out::field_string (const char *fldname, const std::string &string, - const ui_file_style &style) -{ - field_string (fldname, string.c_str (), style); -} - /* VARARGS */ void ui_out::field_fmt (const char *fldname, const char *format, ...) @@ -583,12 +576,6 @@ ui_out::text (const char *string) } void -ui_out::text (const std::string &string) -{ - text (string.c_str ()); -} - -void ui_out::call_do_message (const ui_file_style &style, const char *format, ...) { diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 46dfe28..ecf62e8 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -192,7 +192,10 @@ class ui_out void field_string (const char *fldname, const char *string, const ui_file_style &style = ui_file_style ()); void field_string (const char *fldname, const std::string &string, - const ui_file_style &style = ui_file_style ()); + const ui_file_style &style = ui_file_style ()) + { + field_string (fldname, string.c_str (), style); + } void field_stream (const char *fldname, string_file &stream, const ui_file_style &style = ui_file_style ()); void field_skip (const char *fldname); @@ -204,7 +207,7 @@ class ui_out void spaces (int numspaces); void text (const char *string); - void text (const std::string &string); + void text (const std::string &string) { text (string.c_str ()); } /* Output a printf-style formatted string. In addition to the usual printf format specs, this supports a few GDB-specific |