generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01: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
parent 356add42b4 2267feb475
commit bffb25752b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Net/src/IPAddress.cpp
View File

@@ -425,7 +425,7 @@ IPAddress IPAddress::operator & (const IPAddress& other) const
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
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
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");
@@ -450,7 +450,7 @@ IPAddress IPAddress::operator | (const IPAddress& other) const
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
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
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");
@@ -475,7 +475,7 @@ IPAddress IPAddress::operator ^ (const IPAddress& other) const
const IPv6AddressImpl t(pImpl()->addr(), pImpl()->scope());
const IPv6AddressImpl o(other.pImpl()->addr(), other.pImpl()->scope());
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
else throw Poco::InvalidArgumentException("Invalid or unsupported address family passed to IPAddress()");