From 8450bb37ed545900daa928d555ccc51582cabe96 Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Mon, 20 May 2024 09:24:55 +0200 Subject: [PATCH] Replace `memcmp` by `std::equal`. --- src/include/util.h | 7 +++++++ src/network/net_message.cpp | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/include/util.h b/src/include/util.h index b2404c7c20..73293e896d 100644 --- a/src/include/util.h +++ b/src/include/util.h @@ -197,6 +197,13 @@ namespace ranges return std::none_of(std::begin(range), std::end(range), std::forward(predicate)); } + template + bool equal(const Range &range1, const Range &range2) + { + return std::equal(std::begin(range1), std::end(range1), std::begin(range2), std::end(range2)); + } + + template std::size_t count_if(const Range &range, Predicate &&predicate) { diff --git a/src/network/net_message.cpp b/src/network/net_message.cpp index 6441199baf..02593c9c4f 100644 --- a/src/network/net_message.cpp +++ b/src/network/net_message.cpp @@ -348,9 +348,8 @@ void CServerSetup::Save(const std::function & f) { bool CServerSetup::operator == (const CServerSetup &rhs) const { - return (ServerGameSettings == rhs.ServerGameSettings - && memcmp(CompOpt, rhs.CompOpt, sizeof(CompOpt)) == 0 - && memcmp(Ready, rhs.Ready, sizeof(Ready)) == 0); + return (ServerGameSettings == rhs.ServerGameSettings && ranges::equal(CompOpt, rhs.CompOpt) + && ranges::equal(Ready, rhs.Ready)); } //