Use path coercion in track iterators

[r2c2.git] / source / network / server.cpp

diff --git a/source/network/server.cpp b/source/network/server.cpp
index bf404e9b5ea90eae6116d7ce5651f7e5b7acf429..aced6f7202f2e6dc894af1ec686fb4fb51a1c72f 100644 (file)
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -34,6 +34,9 @@ Server::Server(Layout &l):
        listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
 }
 
+Server::~Server()
+{ }
+
 void Server::use_event_dispatcher(IO::EventDispatcher &ed)
 {
        event_disp = &ed;
@@ -56,7 +59,7 @@ void Server::driver_state_changed()
        send(pkt);
 }
 
-void Server::emergency(const string &msg)
+void Server::emergency(Block *, const string &msg)
 {
        EmergencyPacket pkt;
        pkt.message = msg;
@@ -157,7 +160,7 @@ void Server::Connection::handshake_done()
                comm.send(pkt);
        }
 
-       const set<Route *> &routes = server.layout.get_routes();
+       const set<Route *> &routes = server.layout.get_all<Route>();
        for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
                if(!(*i)->is_temporary())
                {