OpenSolaris + SunPro C++ compile fix

This commit is contained in:
Marian Krivos
2009-02-24 22:00:36 +00:00
parent ef850957c5
commit b99f4b6d1f
10 changed files with 35 additions and 17 deletions

View File

@@ -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)

View File

@@ -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 {

View File

@@ -33,7 +33,7 @@
// DEALINGS IN THE SOFTWARE.
//
#define __EXTENSIONS__
#include <math.h>
#include "Poco/FPEnvironment_SUN.h"