From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 9B9853858D20; Fri, 17 May 2024 15:38:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B9853858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1715960323; bh=lMxQqPbSPWVl1IqsRjQKGugvTk+VG/qGeXkZMzmMJCs=; h=From:To:Subject:Date:From; b=PwTrYvQMpsVe52YUuF7HMtcJVpWYO74wzWwwb/q2eZfz9cn4ZBxJK9B24pX/iYhiT /NMX4A3gAdN3LG2yJLP13xBSHrBpK/VvB4nQhN2BaJByaQ2TuGaI5FYKLjY4aq8+vv tqAeJ1fNI+1pSOWI9ObTyP6w4zr/f88a3mkwiS0M= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Inline some ui_out methods X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 1f8243f0398689189dfab7a669729a8c447467a8 X-Git-Newrev: 650a81d87bc438c67b077fcf4e529e3e9c772d5d Message-Id: <20240517153843.9B9853858D20@sourceware.org> Date: Fri, 17 May 2024 15:38:43 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D650a81d87bc4= 38c67b077fcf4e529e3e9c772d5d commit 650a81d87bc438c67b077fcf4e529e3e9c772d5d Author: Tom Tromey Date: Fri May 10 13:13:03 2024 -0600 Inline some ui_out methods =20 I noticed a few ui_out methods that are just trivial wrappers. This patch moves these to ui-out.h, as it seems like they should be inlineable. =20 Approved-By: Andrew Burgess Diff: --- gdb/ui-out.c | 43 ------------------------------------------- gdb/ui-out.h | 17 ++++++++++------- 2 files changed, 10 insertions(+), 50 deletions(-) diff --git a/gdb/ui-out.c b/gdb/ui-out.c index b3a2fb7f4e5..d5bc4947f63 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -555,18 +555,6 @@ ui_out::field_fmt (const char *fldname, const ui_file_= style &style, va_end (args); } =20 -void -ui_out::spaces (int numspaces) -{ - do_spaces (numspaces); -} - -void -ui_out::text (const char *string) -{ - do_text (string); -} - void ui_out::call_do_message (const ui_file_style &style, const char *format, ...) @@ -780,37 +768,6 @@ ui_out::message (const char *format, ...) va_end (args); } =20 -void -ui_out::wrap_hint (int indent) -{ - do_wrap_hint (indent); -} - -void -ui_out::flush () -{ - do_flush (); -} - -void -ui_out::redirect (ui_file *outstream) -{ - do_redirect (outstream); -} - -/* Test the flags against the mask given. */ -ui_out_flags -ui_out::test_flags (ui_out_flags mask) -{ - return m_flags & mask; -} - -bool -ui_out::is_mi_like_p () const -{ - return do_is_mi_like_p (); -} - /* Verify that the field/tuple/list is correctly positioned. Return the field number and corresponding alignment (if available/applicable). */ diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 5b6ddd55063..74b570b1794 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -163,6 +163,8 @@ class ui_out explicit ui_out (ui_out_flags flags =3D 0); virtual ~ui_out (); =20 + DISABLE_COPY_AND_ASSIGN (ui_out); + void push_level (ui_out_type type); void pop_level (ui_out_type type); =20 @@ -203,8 +205,8 @@ class ui_out const char *format, ...) ATTRIBUTE_PRINTF (4, 5); =20 - void spaces (int numspaces); - void text (const char *string); + void spaces (int numspaces) { do_spaces (numspaces); } + void text (const char *string) { do_text (string); } void text (const std::string &string) { text (string.c_str ()); } =20 /* Output a printf-style formatted string. In addition to the usual @@ -255,21 +257,22 @@ class ui_out void vmessage (const ui_file_style &in_style, const char *format, va_list args) ATTRIBUTE_PRINTF (3, 0); =20 - void wrap_hint (int indent); + void wrap_hint (int indent) { do_wrap_hint (indent); } =20 - void flush (); + void flush () { do_flush (); } =20 /* Redirect the output of a ui_out object temporarily. */ - void redirect (ui_file *outstream); + void redirect (ui_file *outstream) { do_redirect (outstream); } =20 - ui_out_flags test_flags (ui_out_flags mask); + ui_out_flags test_flags (ui_out_flags mask) + { return m_flags & mask; } =20 /* HACK: Code in GDB is currently checking to see the type of ui_out builder when determining which output to produce. This function is a hack to encapsulate that test. Once GDB manages to separate the CLI/MI from the core of GDB the problem should just go away .... */ =20 - bool is_mi_like_p () const; + bool is_mi_like_p () const { return do_is_mi_like_p (); } =20 bool query_table_field (int colno, int *width, int *alignment, const char **col_name);