generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-16 15:01:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1602 from bakercp/patch-1

Browse Source 
Fixed position of scope parameter.  Fixes #1552
This commit is contained in:
Günter Obiltschnig 2017-02-20 09:28:13 +01:00 committed by GitHub
commit bffb25752b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Net/src/IPAddress.cpp
View File

@ -424,8 +424,8 @@ IPAddress IPAddress::operator & (const IPAddress& other) const
{ {
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope()); const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope()); const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
const IPv6AddressImpl r = t & o; const IPv6AddressImpl r = t & o;
return IPAddress(r.addr(), r.scope(), sizeof(struct in6_addr)); return IPAddress(r.addr(), sizeof(struct in6_addr), r.scope());
} }
#endif #endif
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()"); else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");
@ -449,8 +449,8 @@ IPAddress IPAddress::operator | (const IPAddress& other) const
{ {
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope()); const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope()); const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
const IPv6AddressImpl r = t | o; const IPv6AddressImpl r = t | o;
return IPAddress(r.addr(), r.scope(), sizeof(struct in6_addr)); return IPAddress(r.addr(), sizeof(struct in6_addr), r.scope());
} }
#endif #endif
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()"); else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");
@ -474,8 +474,8 @@ IPAddress IPAddress::operator ^ (const IPAddress& other) const
{ {
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope()); const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope()); const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
const IPv6AddressImpl r = t ^ o; const IPv6AddressImpl r = t ^ o;
return IPAddress(r.addr(), r.scope(), sizeof(struct in6_addr)); return IPAddress(r.addr(), sizeof(struct in6_addr), r.scope());
} }
#endif #endif
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()"); else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");
@ -495,7 +495,7 @@ IPAddress IPAddress::operator ~ () const
else if (family() == IPv6) else if (family() == IPv6)
{ {
const IPv6AddressImpl self(pImpl()->addr(), pImpl()->scope()); const IPv6AddressImpl self(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl r = ~self; const IPv6AddressImpl r = ~self;
return IPAddress(r.addr(), sizeof(struct in6_addr), r.scope()); return IPAddress(r.addr(), sizeof(struct in6_addr), r.scope());
} }
#endif #endif