generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

fixes from 1.3.4

Browse Source
This commit is contained in:
Guenter Obiltschnig 2009-03-24 09:23:21 +00:00
parent fd98b17390
commit 37e6fa383a
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Crypto/include/Poco/Crypto/CryptoTransform.h
View File

@ -41,7 +41,8 @@
#include "Poco/Crypto/Crypto.h"
#include <fstream> // std::streamsize
#include <ios>
namespace Poco {
namespace Crypto {

6
Net/include/Poco/Net/NetworkInterface.h
View File

@ -1,7 +1,7 @@
//
// NetworkInterface.h
//
// $Id: //poco/1.3/Net/include/Poco/Net/NetworkInterface.h#6 $
// $Id: //poco/1.3/Net/include/Poco/Net/NetworkInterface.h#7 $
//
// Library: Net
// Package: Sockets
@ -70,13 +70,13 @@ public:
/// The name is empty, the IP address is the wildcard
/// address and the index is zero.
NetworkInterface(const NetworkInterface& interface);
NetworkInterface(const NetworkInterface& interfc);
/// Creates the NetworkInterface by copying another one.
~NetworkInterface();
/// Destroys the NetworkInterface.
NetworkInterface& operator = (const NetworkInterface& interface);
NetworkInterface& operator = (const NetworkInterface& interfc);
/// Assigns another NetworkInterface.
void swap(NetworkInterface& other);

15
Net/src/NetworkInterface.cpp
View File

@ -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;
}

2
Net/src/SocketImpl.cpp
View File

@ -913,7 +913,7 @@ void SocketImpl::error(int code, const std::string& arg)
case POCO_EHOSTUNREACH:
throw NetException("No route to host", code);
default:
throw IOException(NumberFormatter::format(code) + arg, code);
throw IOException(NumberFormatter::format(code), arg, code);
}
}