mirror of
https://github.com/pocoproject/poco.git
synced 2025-11-24 06:04:15 +01:00
OpenSolaris + SunPro C++ compile fix
This commit is contained in:
@@ -155,7 +155,9 @@ public:
|
||||
/// when already another element was present, in this case Iterator
|
||||
/// points to that other element)
|
||||
{
|
||||
return insert(std::make_pair(key, value));
|
||||
// fix: SunPro C++ is silly ...
|
||||
ValueType valueType(key,value);
|
||||
return insert(valueType);
|
||||
}
|
||||
|
||||
inline InsRetVal insert(const ValueType& aPair)
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <cstring>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
|
||||
@@ -206,8 +205,11 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
|
||||
// General Unix
|
||||
//
|
||||
#include <sys/ioctl.h>
|
||||
#if defined(sun) || defined(__sun)
|
||||
#if defined(sun) || defined(__sun) || defined(__sun__)
|
||||
#define __EXTENSIONS__
|
||||
#include <net/if_arp.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
@@ -219,7 +221,6 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
|
||||
#include <net/if_arp.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
|
||||
#define __EXTENSIONS__
|
||||
#include <math.h>
|
||||
#include "Poco/FPEnvironment_SUN.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user