summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionFactory.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-01-22 13:34:49 +0100
committerBenoit Foucher <benoit@zeroc.com>2015-01-22 13:34:49 +0100
commit612491e1b1da0217922ccae380502e7904299f62 (patch)
treef12bb0220778d8338e059c031bbec08a83121a56 /cpp/src/Ice/ConnectionFactory.h
parentremoving lang/CHANGES files (diff)
downloadice-612491e1b1da0217922ccae380502e7904299f62.tar.bz2
ice-612491e1b1da0217922ccae380502e7904299f62.tar.xz
ice-612491e1b1da0217922ccae380502e7904299f62.zip
Fixes to align with Ice Touch code
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.h')
-rw-r--r--cpp/src/Ice/ConnectionFactory.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 38dc176793f..64c8d130f4e 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -163,7 +163,6 @@ private:
class IncomingConnectionFactory : public EventHandler,
public Ice::ConnectionI::StartCallback,
public IceUtil::Monitor<IceUtil::Mutex>
-
{
public:
@@ -200,7 +199,7 @@ public:
private:
IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const Ice::ObjectAdapterIPtr&);
- void initialize(const std::string&);
+ void initialize();
virtual ~IncomingConnectionFactory();
friend class Ice::ObjectAdapterI;
@@ -213,14 +212,16 @@ private:
};
void setState(State);
- void closeAcceptor(bool);
+
+ void createAcceptor();
+ void closeAcceptor();
const InstancePtr _instance;
const FactoryACMMonitorPtr _monitor;
- const AcceptorPtr _acceptor;
+ AcceptorPtr _acceptor;
const TransceiverPtr _transceiver;
- const EndpointIPtr _endpoint;
+ EndpointIPtr _endpoint;
Ice::ObjectAdapterIPtr _adapter;