diff options
| author | Marc Laukien <marc@zeroc.com> | 2005-09-22 19:25:03 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2005-09-22 19:25:03 +0000 |
| commit | 7677d7afde77b638f12285989c312ae61668e316 (patch) | |
| tree | 76f5ac0d3ece800e008b5e3f0a7ea33ac1c7f624 /cpp/src/Ice/ConnectionFactory.h | |
| parent | Propagate service-order move in template to instances (diff) | |
| download | ice-7677d7afde77b638f12285989c312ae61668e316.tar.bz2 ice-7677d7afde77b638f12285989c312ae61668e316.tar.xz ice-7677d7afde77b638f12285989c312ae61668e316.zip | |
hold fixes
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.h')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 9beccb40c31..f2645215edb 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -46,7 +46,7 @@ public: Ice::ConnectionIPtr create(const std::vector<EndpointIPtr>&, bool&); void setRouterInfo(const RouterInfoPtr&); - void removeAdapter(const ::Ice::ObjectAdapterPtr&); + void removeAdapter(const Ice::ObjectAdapterPtr&); void flushBatchRequests(); private: @@ -85,14 +85,14 @@ public: virtual void read(BasicStream&); virtual void message(BasicStream&, const ThreadPoolPtr&); virtual void finished(const ThreadPoolPtr&); - virtual void exception(const ::Ice::LocalException&); + virtual void exception(const Ice::LocalException&); virtual std::string toString() const; private: - IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const ::Ice::ObjectAdapterPtr&); + IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const Ice::ObjectAdapterPtr&); virtual ~IncomingConnectionFactory(); - friend class ::Ice::ObjectAdapterI; + friend class Ice::ObjectAdapterI; enum State { @@ -125,9 +125,10 @@ private: const TransceiverPtr _transceiver; const EndpointIPtr _endpoint; - const ::Ice::ObjectAdapterPtr _adapter; + const Ice::ObjectAdapterPtr _adapter; bool _registeredWithPool; + int _finishedCount; const bool _warn; |