Skip to content

Commit 37e6fa3

Browse files
committed
fixes from 1.3.4
1 parent fd98b17 commit 37e6fa3

4 files changed

Lines changed: 12 additions & 14 deletions

File tree

‎Crypto/include/Poco/Crypto/CryptoTransform.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141

4242

4343
#include "Poco/Crypto/Crypto.h"
44-
#include <fstream> // std::streamsize
44+
#include <ios>
45+
4546

4647
namespace Poco {
4748
namespace Crypto {

‎Net/include/Poco/Net/NetworkInterface.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// NetworkInterface.h
33
//
4-
// $Id: //poco/1.3/Net/include/Poco/Net/NetworkInterface.h#6 $
4+
// $Id: //poco/1.3/Net/include/Poco/Net/NetworkInterface.h#7 $
55
//
66
// Library: Net
77
// Package: Sockets
@@ -70,13 +70,13 @@ class Net_API NetworkInterface
7070
/// The name is empty, the IP address is the wildcard
7171
/// address and the index is zero.
7272

73-
NetworkInterface(const NetworkInterface& interface);
73+
NetworkInterface(const NetworkInterface& interfc);
7474
/// Creates the NetworkInterface by copying another one.
7575

7676
~NetworkInterface();
7777
/// Destroys the NetworkInterface.
7878

79-
NetworkInterface& operator = (const NetworkInterface& interface);
79+
NetworkInterface& operator = (const NetworkInterface& interfc);
8080
/// Assigns another NetworkInterface.
8181

8282
void swap(NetworkInterface& other);

‎Net/src/NetworkInterface.cpp‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// NetworkInterface.cpp
33
//
4-
// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#8 $
4+
// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#9 $
55
//
66
// Library: Net
77
// Package: Sockets
@@ -33,10 +33,6 @@
3333
// DEALINGS IN THE SOFTWARE.
3434
//
3535

36-
#if defined(sun) || defined(__sun) || defined(__sun__)
37-
#define __EXTENSIONS__
38-
#include <net/if.h>
39-
#endif
4036

4137
#include "Poco/Net/NetworkInterface.h"
4238
#include "Poco/Net/DatagramSocket.h"
@@ -48,6 +44,7 @@
4844
#endif
4945
#include <cstring>
5046

47+
5148
using Poco::NumberFormatter;
5249
using Poco::FastMutex;
5350

@@ -193,8 +190,8 @@ NetworkInterface::NetworkInterface():
193190
}
194191

195192

196-
NetworkInterface::NetworkInterface(const NetworkInterface& interface):
197-
_pImpl(interface._pImpl)
193+
NetworkInterface::NetworkInterface(const NetworkInterface& interfc):
194+
_pImpl(interfc._pImpl)
198195
{
199196
_pImpl->duplicate();
200197
}
@@ -230,9 +227,9 @@ NetworkInterface::~NetworkInterface()
230227
}
231228

232229

233-
NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interface)
230+
NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interfc)
234231
{
235-
NetworkInterface tmp(interface);
232+
NetworkInterface tmp(interfc);
236233
swap(tmp);
237234
return *this;
238235
}

‎Net/src/SocketImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ void SocketImpl::error(int code, const std::string& arg)
913913
case POCO_EHOSTUNREACH:
914914
throw NetException("No route to host", code);
915915
default:
916-
throw IOException(NumberFormatter::format(code) + arg, code);
916+
throw IOException(NumberFormatter::format(code), arg, code);
917917
}
918918
}
919919

0 commit comments

Comments
 (0)