generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 00:49:46 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH# 188: Net: SocketAddress operator < unusable for std::map key

Browse Source
This commit is contained in:
Guenter Obiltschnig
2013-05-24 22:06:15 +02:00
parent 6ca49eb7f6
commit 28320ddb1e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Net/src/SocketAddress.cpp
View File

@@ -161,9 +161,11 @@ SocketAddress::~SocketAddress()
bool SocketAddress::operator < (const SocketAddress& socketAddress) const bool SocketAddress::operator < (const SocketAddress& socketAddress) const
{ {
if (family() < socketAddress.family()) return true; if (family() < addr.family()) return true;
if (host() < socketAddress.host()) return true; if (family() > addr.family()) return false;
return (port() < socketAddress.port()); if (host() < addr.host()) return true;
if (host() > addr.host()) return false;
return (port() < addr.port());
} }

10
Net/testsuite/src/SocketAddressTest.cpp
View File

@@ -141,13 +141,13 @@ void SocketAddressTest::testSocketAddress()
void SocketAddressTest::testSocketRelationals() void SocketAddressTest::testSocketRelationals()
{ {
SocketAddress sa1("192.168.1.100", 100); SocketAddress sa1("192.168.1.100", 100);
SocketAddress sa2("192.168.1.100:100"); SocketAddress sa2("192.168.1.100:100");
assert (sa1 == sa2); assert (sa1 == sa2);
SocketAddress sa3("192.168.1.101", "99"); SocketAddress sa3("192.168.1.101", "99");
assert (sa2 < sa3); assert (sa2 < sa3);
SocketAddress sa4("192.168.1.100", "102"); SocketAddress sa4("192.168.1.101", "102");
assert (sa3 < sa4); assert (sa3 < sa4);
} }