diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2009-06-04 22:32:56 +0200 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2009-06-04 22:32:56 +0200 |
commit | d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4 (patch) | |
tree | 5bc2a48eb2a03ae03e321d7d576658eeabad688d /src/Net/Listener.cpp | |
parent | 0b27c37fe95c6aced613d51a3624f8930a96ad3f (diff) | |
download | mad-d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4.tar mad-d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4.zip |
Alte Signal-Implementierung entfernt
Diffstat (limited to 'src/Net/Listener.cpp')
-rw-r--r-- | src/Net/Listener.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Net/Listener.cpp b/src/Net/Listener.cpp index b9779ec..6da2762 100644 --- a/src/Net/Listener.cpp +++ b/src/Net/Listener.cpp @@ -39,8 +39,8 @@ void Listener::handleAccept(const boost::system::error_code &error, boost::share con->_setState(Connection::CONNECT); - Signals::Connection2 con1 = con->connectSignalConnected(boost::bind(&Listener::handleConnect, this, con)); - Signals::Connection2 con2 = con->connectSignalDisconnected(boost::bind(&Listener::handleDisconnect, this, con)); + Signals::Connection con1 = con->connectSignalConnected(boost::bind(&Listener::handleConnect, this, con)); + Signals::Connection con2 = con->connectSignalDisconnected(boost::bind(&Listener::handleDisconnect, this, con)); connections.insert(std::make_pair(con, std::make_pair(con1, con2))); @@ -54,7 +54,7 @@ void Listener::handleAccept(const boost::system::error_code &error, boost::share void Listener::handleConnect(boost::shared_ptr<Connection> con) { { boost::lock_guard<boost::mutex> lock(mutex); - std::map<boost::shared_ptr<Connection>, std::pair<Signals::Connection2, Signals::Connection2> >::iterator it = connections.find(con); + std::map<boost::shared_ptr<Connection>, std::pair<Signals::Connection, Signals::Connection> >::iterator it = connections.find(con); if(it == connections.end()) return; @@ -93,7 +93,7 @@ sslContext(Connection::ioService, boost::asio::ssl::context::sslv23) } Listener::~Listener() { - for(std::map<boost::shared_ptr<Connection>,std::pair<Signals::Connection2, Signals::Connection2> >::iterator con = connections.begin(); con != connections.end(); ++con) { + for(std::map<boost::shared_ptr<Connection>,std::pair<Signals::Connection, Signals::Connection> >::iterator con = connections.begin(); con != connections.end(); ++con) { con->first->disconnect(); // TODO wait... } |