Fixed bug #2934

10 files changed, 36 insertions, 1 deletions

diff --git a/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp b/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
index 6604569ac15..7bfe9e9f3e5 100644
--- a/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
+++ b/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
@@ -18,6 +18,9 @@ Ice::ObjectAdapterPtr Filesystem::NodeI::_adapter;
 Freeze::EvictorPtr Filesystem::NodeI::_evictor;
 
 Filesystem::NodeI::NodeI()
+#ifdef __SUNPRO_CC
+  : _ID(Ice::Identity())
+#endif
 {
 }
 
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index b9ae321550c..b3a1e603394 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -148,11 +148,13 @@ public:
     virtual bool operator!=(const EndpointI&) const = 0;
     virtual bool operator<(const EndpointI&) const = 0;
 
-private:
+protected:
 
     virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const;
     friend class EndpointHostResolver;
 
+private:
+
 #if defined(__SUNPRO_CC) || defined(__HP_aCC)
     //
     // COMPILERFIX: prevent the compiler from emitting a warning about
diff --git a/cpp/src/Ice/UnknownEndpointI.h b/cpp/src/Ice/UnknownEndpointI.h
index 8010cc54d67..4c383ebdedf 100644
--- a/cpp/src/Ice/UnknownEndpointI.h
+++ b/cpp/src/Ice/UnknownEndpointI.h
@@ -45,6 +45,9 @@ public:
     virtual bool operator!=(const EndpointI&) const;
     virtual bool operator<(const EndpointI&) const;
 
+protected:
+    using EndpointI::connectors;
+
 private:
 
 #if defined(__SUNPRO_CC)
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index dd49f5c4431..e9f1f962a4f 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -50,6 +50,12 @@ class Database : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
+#ifdef __SUNPRO_CC
+    using IceUtil::Monitor<IceUtil::Mutex>::lock;
+    using IceUtil::Monitor<IceUtil::Mutex>::unlock;
+#endif
+
+
     Database(const Ice::ObjectAdapterPtr&, const IceStorm::TopicManagerPrx&, const std::string&, const TraceLevelsPtr&,
              const RegistryInfo&, bool);
     virtual ~Database();
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index fc019bbca57..4f69318239f 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -130,6 +130,8 @@ public:
 
 protected:
 
+    using CommunicatorHelper::instantiateImpl;
+
     void instantiateImpl(const ServiceDescriptorPtr&, const Resolver&, const PropertyDescriptorSeq&,
                          const PropertySetDescriptorDict&) const;
 
@@ -157,6 +159,8 @@ public:
 
 protected:
 
+    using CommunicatorHelper::instantiateImpl;
+
     void printImpl(const Ice::CommunicatorPtr&, IceUtilInternal::Output&, const ServerInfo&) const;
     void instantiateImpl(const ServerDescriptorPtr&, const Resolver&, const PropertyDescriptorSeq&) const;
 
@@ -221,6 +225,8 @@ public:
 
 protected:
 
+    using ServerHelper::instantiateImpl;
+
     void instantiateImpl(const IceBoxDescriptorPtr&, const Resolver&, const PropertyDescriptorSeq&,
                          const PropertySetDescriptorDict&) const;
 
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index da84f6738d0..6f2ca39dd83 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -47,6 +47,10 @@ class ReplicaCache : public CacheByString<ReplicaEntry>
 {
 public:
 
+#ifdef __SUNPRO_CC
+    using CacheByString<ReplicaEntry>::remove;
+#endif 
+
     ReplicaCache(const Ice::CommunicatorPtr&, const IceStorm::TopicManagerPrx&);
 
     ReplicaEntryPtr add(const std::string&, const ReplicaSessionIPtr&);
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index 2a4b5359414..5e70790592c 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -96,6 +96,10 @@ class ServerCache : public CacheByString<ServerEntry>
 {
 public:
 
+#ifdef __SUNPRO_CC
+    using CacheByString<ServerEntry>::remove;
+#endif
+
     ServerCache(const Ice::CommunicatorPtr&, const std::string&, NodeCache&, AdapterCache&, ObjectCache&, AllocatableObjectCache&);
 
     ServerEntryPtr add(const ServerInfo&);
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 362c612d335..3709c515495 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -114,6 +114,7 @@ public:
 
 private:
 
+    using GeneratorBase::printHeaderFooter;
     void printHeaderFooter();
 
     typedef ::std::pair< ::std::string, ::std::string> StringPair;
diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h
index d9c7a82cff6..0ed8e9e7c2b 100644
--- a/cpp/test/Ice/background/EndpointI.h
+++ b/cpp/test/Ice/background/EndpointI.h
@@ -42,6 +42,9 @@ public:
     virtual bool operator!=(const IceInternal::EndpointI&) const;
     virtual bool operator<(const IceInternal::EndpointI&) const;
 
+protected:
+
+    using IceInternal::EndpointI::connectors;
 private:
 
     EndpointI(const IceInternal::EndpointIPtr&);
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index af464761ef3..08a3b3b2975 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -49,6 +49,9 @@ int
 MyObjectI::badSystemAdd(int, int, const Ice::Current&)
 {
     throw Ice::InitializationException(__FILE__, __LINE__, "testing");
+#ifdef __SUNPRO_CC
+    return 0;
+#endif
 }