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

Merge pull request #1971 from Bjoe/remove-soo-in-net

Browse Source 
Remove SOO in 1.8
This commit is contained in:
Günter Obiltschnig
2017-11-07 14:46:17 +01:00
committed by GitHub
parent a1291ea604 1ec60225b6
commit 37927faf66
6 changed files with 3 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Net/src/IPAddress.cpp
View File

@@ -138,9 +138,7 @@ IPAddress::IPAddress(const std::string& addr, Family family)
IPAddress::IPAddress(const void* addr, poco_socklen_t length)
#ifndef POCO_HAVE_ALIGNMENT
: _pImpl(0)
#endif
{
if (length == sizeof(struct in_addr))
newIPv4(addr);
@@ -188,9 +186,7 @@ IPAddress::IPAddress(unsigned prefix, Family family)
#if defined(_WIN32)
IPAddress::IPAddress(const SOCKET_ADDRESS& socket_address)
#ifndef POCO_HAVE_ALIGNMENT
: _pImpl(0)
#endif
{
ADDRESS_FAMILY family = socket_address.lpSockaddr->sa_family;
if (family == AF_INET)
@@ -221,7 +217,6 @@ IPAddress::IPAddress(const struct sockaddr& sockaddr)
IPAddress::~IPAddress()
{
destruct();
}
@@ -229,7 +224,6 @@ IPAddress& IPAddress::operator = (const IPAddress& addr)
{
if (&addr != this)
{
destruct();
if (addr.family() == IPAddress::IPv4)
newIPv4(addr.addr());
#if defined(POCO_HAVE_IPv6)

2
Net/src/SocketAddress.cpp
View File

@@ -168,7 +168,6 @@ SocketAddress::SocketAddress(const struct sockaddr* sockAddr, poco_socklen_t len
SocketAddress::~SocketAddress()
{
destruct();
}
@@ -189,7 +188,6 @@ SocketAddress& SocketAddress::operator = (const SocketAddress& socketAddress)
{
if (&socketAddress != this)
{
destruct();
if (socketAddress.family() == IPv4)
newIPv4(reinterpret_cast<const sockaddr_in*>(socketAddress.addr()));
#if defined(POCO_HAVE_IPv6)