2 files changed, 6 insertions, 0 deletions
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
 }