diff options
| author | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
| commit | 27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc (patch) | |
| tree | 4d825c1cb800b154ea4b33b238027f1ff9a13531 /cpp/test | |
| parent | Fixed comment for GCShared (wrong namespace). (diff) | |
| parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
| download | ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.bz2 ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.xz ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/background/EndpointI.h | 3 | ||||
| -rw-r--r-- | cpp/test/Ice/interceptor/MyObjectI.cpp | 3 |
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 } |