diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-04-27 14:18:34 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-04-27 14:18:34 -0230 |
| commit | 401516d06074526382156f1c1923c3cdb9e82077 (patch) | |
| tree | 2a378cfd0479631b0478b52c7c993c5046da7592 /cpp/src/Ice/ObjectAdapterFactory.h | |
| parent | Bug 2475 - remove AMD_Array_Object_ice_invoke (diff) | |
| download | ice-401516d06074526382156f1c1923c3cdb9e82077.tar.bz2 ice-401516d06074526382156f1c1923c3cdb9e82077.tar.xz ice-401516d06074526382156f1c1923c3cdb9e82077.zip | |
Bug 3138 - remove object adapter map
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 1cdddfde26c..0423522ca3d 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -14,6 +14,8 @@ #include <IceUtil/RecMutex.h> #include <IceUtil/Monitor.h> +#include <set> + namespace IceInternal { @@ -28,7 +30,7 @@ public: ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&); ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&); - void removeObjectAdapter(const ::std::string&); + void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&); void flushBatchRequests() const; private: @@ -39,7 +41,8 @@ private: InstancePtr _instance; ::Ice::CommunicatorPtr _communicator; - std::map<std::string, ::Ice::ObjectAdapterIPtr> _adapters; + std::set<std::string> _adapterNamesInUse; + std::list<Ice::ObjectAdapterIPtr> _adapters; bool _waitForShutdown; }; |