From 87c3fd9cd8c151f2987f826826d13f3a7e25861a Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Tue, 6 Oct 2020 08:57:30 +0300 Subject: [PATCH] fb_utilities.hh: mark methods noexcept Now that gms::inet_address assignment is marked as noexcept. Signed-off-by: Benny Halevy --- utils/fb_utilities.hh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/fb_utilities.hh b/utils/fb_utilities.hh index 8f83e2dbad..f79eab0398 100644 --- a/utils/fb_utilities.hh +++ b/utils/fb_utilities.hh @@ -50,12 +50,12 @@ using inet_address = gms::inet_address; class fb_utilities { private: - static std::optional& broadcast_address() { + static std::optional& broadcast_address() noexcept { static std::optional _broadcast_address; return _broadcast_address; } - static std::optional& broadcast_rpc_address() { + static std::optional& broadcast_rpc_address() noexcept { static std::optional _broadcast_rpc_address; return _broadcast_rpc_address; @@ -63,26 +63,26 @@ private: public: static constexpr int32_t MAX_UNSIGNED_SHORT = 0xFFFF; - static void set_broadcast_address(inet_address addr) { + static void set_broadcast_address(inet_address addr) noexcept { broadcast_address() = addr; } - static void set_broadcast_rpc_address(inet_address addr) { + static void set_broadcast_rpc_address(inet_address addr) noexcept { broadcast_rpc_address() = addr; } - static const inet_address get_broadcast_address() { + static const inet_address get_broadcast_address() noexcept { assert(broadcast_address()); return *broadcast_address(); } - static const inet_address get_broadcast_rpc_address() { + static const inet_address get_broadcast_rpc_address() noexcept { assert(broadcast_rpc_address()); return *broadcast_rpc_address(); } - static bool is_me(gms::inet_address addr) { + static bool is_me(gms::inet_address addr) noexcept { return addr == get_broadcast_address(); } };