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/src/IceGrid/ServerCache.h | |
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/src/IceGrid/ServerCache.h')
-rw-r--r-- | cpp/src/IceGrid/ServerCache.h | 4 |
1 files changed, 4 insertions, 0 deletions
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&); |