5 files changed, 49 insertions, 31 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index de1b38b2efe..074f9f690bc 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -51,6 +51,14 @@ const DWORD SIGHUP = CTRL_LOGOFF_EVENT;
 #endif
 
 //
+// Compaq C++ defines signal() as a macro, causing problems with the _condVar->signal()
+// statement, which the compiler for some reason replaces by the macro.
+//
+#if defined (__digital__) && defined (__unix__)
+#   undef signal
+#endif
+
+//
 // CtrlCHandler callbacks.
 //
 
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index c35d899089a..f81fc8c03e8 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -36,7 +36,7 @@ typedef int ssize_t;
 #   include <netdb.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__osf__) 
 typedef int socklen_t;
 #endif
 
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index 413b81b0832..5396a27b9d5 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -135,36 +135,6 @@ private:
 };
 typedef IceUtil::Handle<ServerHelper> ServerHelperPtr;
 
-class ServiceInstanceHelper;
-
-class IceBoxHelper : public ServerHelper
-{
-public:
-
-    IceBoxHelper(const IceBoxDescriptorPtr&);
-    IceBoxHelper() { }
-
-    bool operator==(const IceBoxHelper&) const;
-    bool operator!=(const IceBoxHelper&) const;    
-
-    virtual ServerDescriptorPtr instantiate(const Resolver&) const;
-
-    virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
-
-    void print(IceUtil::Output&) const;
-    void print(IceUtil::Output&, const std::string&, const std::string&) const;
-
-protected:
-
-    void instantiateImpl(const IceBoxDescriptorPtr&, const Resolver&) const;
-
-private:
-    
-    IceBoxDescriptorPtr _desc;
-
-    std::vector<ServiceInstanceHelper> _services;
-};
-
 class InstanceHelper
 {
 protected:
@@ -176,6 +146,7 @@ protected:
 							 const std::map<std::string, std::string>&) const;
 };
 
+
 class ServiceInstanceHelper : public InstanceHelper
 {
 public:
@@ -198,6 +169,35 @@ private:
     mutable ServiceHelper _service;
 };
 
+
+class IceBoxHelper : public ServerHelper
+{
+public:
+
+    IceBoxHelper(const IceBoxDescriptorPtr&);
+    IceBoxHelper() { }
+
+    bool operator==(const IceBoxHelper&) const;
+    bool operator!=(const IceBoxHelper&) const;    
+
+    virtual ServerDescriptorPtr instantiate(const Resolver&) const;
+
+    virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
+
+    void print(IceUtil::Output&) const;
+    void print(IceUtil::Output&, const std::string&, const std::string&) const;
+
+protected:
+
+    void instantiateImpl(const IceBoxDescriptorPtr&, const Resolver&) const;
+
+private:
+    
+    IceBoxDescriptorPtr _desc;
+
+    std::vector<ServiceInstanceHelper> _services;
+};
+
 class ServerInstanceHelper : public InstanceHelper
 {
 public:
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index ce84b94782d..992289e0f14 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -30,6 +30,11 @@ struct DictIndex
     {
 	return member == rhs.member;
     }
+
+    bool operator!=(const DictIndex& rhs) const
+    {
+	return member != rhs.member;
+    }
 };
 
 struct Dict
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 56ec6c74a7f..e631b8bf955 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -24,6 +24,11 @@ struct DictIndex
     {
 	return member == rhs.member;
     }
+
+    bool operator!=(const DictIndex& rhs) const
+    {
+	return member != rhs.member;
+    }
 };
 
 struct Dict