generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 03:20:11 +01:00
Code Issues Projects Releases Wiki Activity

fix for MSVC issue with static const definitions

Browse Source
This commit is contained in:
Günter Obiltschnig
2015-09-11 09:22:38 +02:00
parent fee347ec6a
commit 8d8074fc00
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Net/src/IPAddress.cpp
View File

@@ -44,10 +44,14 @@ namespace Poco {
namespace Net { namespace Net {
#if !defined(_MSC_VER) || defined(__STDC__)
// Go home MSVC, you're drunk...
// See http://stackoverflow.com/questions/5899857/multiple-definition-error-for-static-const-class-members
const IPAddress::Family IPAddress::IPv4; const IPAddress::Family IPAddress::IPv4;
#if defined(POCO_HAVE_IPv6) #if defined(POCO_HAVE_IPv6)
const IPAddress::Family IPAddress::IPv6; const IPAddress::Family IPAddress::IPv6;
#endif #endif
#endif
IPAddress::IPAddress() IPAddress::IPAddress()

4
Net/src/SocketAddress.cpp
View File

@@ -58,6 +58,9 @@ struct AFLT
// //
#if !defined(_MSC_VER) || defined(__STDC__)
// Go home MSVC, you're drunk...
// See http://stackoverflow.com/questions/5899857/multiple-definition-error-for-static-const-class-members
const SocketAddress::Family SocketAddress::IPv4; const SocketAddress::Family SocketAddress::IPv4;
#if defined(POCO_HAVE_IPv6) #if defined(POCO_HAVE_IPv6)
const SocketAddress::Family SocketAddress::IPv6; const SocketAddress::Family SocketAddress::IPv6;
@@ -65,6 +68,7 @@ const SocketAddress::Family SocketAddress::IPv6;
#if defined(POCO_OS_FAMILY_UNIX) #if defined(POCO_OS_FAMILY_UNIX)
const SocketAddress::Family SocketAddress::UNIX_LOCAL; const SocketAddress::Family SocketAddress::UNIX_LOCAL;
#endif #endif
#endif
SocketAddress::SocketAddress() SocketAddress::SocketAddress()