From 20d69b957f44b07dac13f140d35684810e34a301 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 22 Jul 2015 10:54:17 +0200 Subject: Net/StaticSocketAddress: add equality operator with SocketAddress --- src/net/StaticSocketAddress.cxx | 7 ------- src/net/StaticSocketAddress.hxx | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/net/StaticSocketAddress.cxx b/src/net/StaticSocketAddress.cxx index 27de7f6f5..94db4a49c 100644 --- a/src/net/StaticSocketAddress.cxx +++ b/src/net/StaticSocketAddress.cxx @@ -41,10 +41,3 @@ StaticSocketAddress::operator=(SocketAddress other) memcpy(&address, other.GetAddress(), size); return *this; } - -bool -StaticSocketAddress::operator==(const StaticSocketAddress &other) const -{ - return size == other.size && - memcmp(&address, &other.address, size) == 0; -} diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx index 0a780f6f6..c8cef9dfe 100644 --- a/src/net/StaticSocketAddress.hxx +++ b/src/net/StaticSocketAddress.hxx @@ -92,9 +92,11 @@ public: } gcc_pure - bool operator==(const StaticSocketAddress &other) const; + bool operator==(SocketAddress other) const { + return (SocketAddress)*this == other; + } - bool operator!=(const StaticSocketAddress &other) const { + bool operator!=(SocketAddress &other) const { return !(*this == other); } }; -- cgit v1.2.3