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