diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-06-05 20:49:26 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-05 20:49:26 +0200 |
commit | be5f41f8ffd74f2651b1db1a61badfd41f17a36d (patch) | |
tree | b94687eaeb0f0024be247ef07efe7541b7d813b2 /cpp/src/Ice/Instance.h | |
parent | Fixed ICE-5490: selector doesn't check for EPOLLERR on Linux (diff) | |
download | ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.tar.bz2 ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.tar.xz ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.zip |
Fixed ICE-5499, new garbage collection support
Diffstat (limited to 'cpp/src/Ice/Instance.h')
-rw-r--r-- | cpp/src/Ice/Instance.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 02e9c02d308..f60a27e298e 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -83,6 +83,7 @@ public: DynamicLibraryListPtr dynamicLibraryList() const; Ice::PluginManagerPtr pluginManager() const; size_t messageSizeMax() const { return _messageSizeMax; } + bool collectObjects() const { return _collectObjects; } const ACMConfig& clientACM() const; const ACMConfig& serverACM() const; Ice::Identity stringToIdentity(const std::string&) const; @@ -120,7 +121,7 @@ private: Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&); virtual ~Instance(); void finishSetup(int&, char*[]); - bool destroy(); + void destroy(); friend class Ice::CommunicatorI; void updateConnectionObservers(); @@ -138,6 +139,7 @@ private: const TraceLevelsPtr _traceLevels; // Immutable, not reset by destroy(). const DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy(). const size_t _messageSizeMax; // Immutable, not reset by destroy(). + const bool _collectObjects; // Immutable, not reset by destroy(). ACMConfig _clientACM; ACMConfig _serverACM; RouterManagerPtr _routerManager; |