mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-30 13:47:10 +01:00
fixes from 1.3.4
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// NetworkInterface.cpp
|
||||
//
|
||||
// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#8 $
|
||||
// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#9 $
|
||||
//
|
||||
// Library: Net
|
||||
// Package: Sockets
|
||||
@@ -33,10 +33,6 @@
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if defined(sun) || defined(__sun) || defined(__sun__)
|
||||
#define __EXTENSIONS__
|
||||
#include <net/if.h>
|
||||
#endif
|
||||
|
||||
#include "Poco/Net/NetworkInterface.h"
|
||||
#include "Poco/Net/DatagramSocket.h"
|
||||
@@ -48,6 +44,7 @@
|
||||
#endif
|
||||
#include <cstring>
|
||||
|
||||
|
||||
using Poco::NumberFormatter;
|
||||
using Poco::FastMutex;
|
||||
|
||||
@@ -193,8 +190,8 @@ NetworkInterface::NetworkInterface():
|
||||
}
|
||||
|
||||
|
||||
NetworkInterface::NetworkInterface(const NetworkInterface& interface):
|
||||
_pImpl(interface._pImpl)
|
||||
NetworkInterface::NetworkInterface(const NetworkInterface& interfc):
|
||||
_pImpl(interfc._pImpl)
|
||||
{
|
||||
_pImpl->duplicate();
|
||||
}
|
||||
@@ -230,9 +227,9 @@ NetworkInterface::~NetworkInterface()
|
||||
}
|
||||
|
||||
|
||||
NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interface)
|
||||
NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interfc)
|
||||
{
|
||||
NetworkInterface tmp(interface);
|
||||
NetworkInterface tmp(interfc);
|
||||
swap(tmp);
|
||||
return *this;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user