From 785e5700ce4bda469e323d1dc7eeae9d86980c79 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 27 Jun 2021 11:06:04 -0600 Subject: Replace exception_print_same with operator!= I noticed that exception_print_same is only used in a single spot, and it seemed to be better as an operator!= method attached to gdb_exception. Regression tested on x86-64 Fedora 34. --- gdbsupport/common-exceptions.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gdbsupport') diff --git a/gdbsupport/common-exceptions.h b/gdbsupport/common-exceptions.h index 92f43d2..5933c73 100644 --- a/gdbsupport/common-exceptions.h +++ b/gdbsupport/common-exceptions.h @@ -165,6 +165,23 @@ struct gdb_exception return message->c_str (); } + /* Compare two exceptions. */ + bool operator== (const gdb_exception &other) const + { + const char *msg1 = message == nullptr ? "" : what (); + const char *msg2 = other.message == nullptr ? "" : other.what (); + + return (reason == other.reason + && error == other.error + && strcmp (msg1, msg2) == 0); + } + + /* Compare two exceptions. */ + bool operator!= (const gdb_exception &other) const + { + return !(*this == other); + } + enum return_reason reason; enum errors error; std::shared_ptr message; -- cgit v1.1