generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 04:17:55 +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
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 "Poco/Crypto/Crypto.h"
#include <fstream> // std::streamsize #include <ios>
namespace Poco { namespace Poco {
namespace Crypto { namespace Crypto {

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

@@ -1,7 +1,7 @@
// //
// NetworkInterface.h // 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 // Library: Net
// Package: Sockets // Package: Sockets
@@ -70,13 +70,13 @@ public:
/// The name is empty, the IP address is the wildcard /// The name is empty, the IP address is the wildcard
/// address and the index is zero. /// address and the index is zero.
NetworkInterface(const NetworkInterface& interface); NetworkInterface(const NetworkInterface& interfc);
/// Creates the NetworkInterface by copying another one. /// Creates the NetworkInterface by copying another one.
~NetworkInterface(); ~NetworkInterface();
/// Destroys the NetworkInterface. /// Destroys the NetworkInterface.
NetworkInterface& operator = (const NetworkInterface& interface); NetworkInterface& operator = (const NetworkInterface& interfc);
/// Assigns another NetworkInterface. /// Assigns another NetworkInterface.
void swap(NetworkInterface& other); void swap(NetworkInterface& other);

15
Net/src/NetworkInterface.cpp
View File

@@ -1,7 +1,7 @@
// //
// NetworkInterface.cpp // NetworkInterface.cpp
// //
// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#8 $ // $Id: //poco/1.3/Net/src/NetworkInterface.cpp#9 $
// //
// Library: Net // Library: Net
// Package: Sockets // Package: Sockets
@@ -33,10 +33,6 @@
// DEALINGS IN THE SOFTWARE. // 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/NetworkInterface.h"
#include "Poco/Net/DatagramSocket.h" #include "Poco/Net/DatagramSocket.h"
@@ -48,6 +44,7 @@
#endif #endif
#include <cstring> #include <cstring>
using Poco::NumberFormatter; using Poco::NumberFormatter;
using Poco::FastMutex; using Poco::FastMutex;
@@ -193,8 +190,8 @@ NetworkInterface::NetworkInterface():
} }
NetworkInterface::NetworkInterface(const NetworkInterface& interface): NetworkInterface::NetworkInterface(const NetworkInterface& interfc):
_pImpl(interface._pImpl) _pImpl(interfc._pImpl)
{ {
_pImpl->duplicate(); _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); swap(tmp);
return *this; 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: case POCO_EHOSTUNREACH:
throw NetException("No route to host", code); throw NetException("No route to host", code);
default: default:
throw IOException(NumberFormatter::format(code) + arg, code); throw IOException(NumberFormatter::format(code), arg, code);
} }
} }