fixed some file headers to the new format

[senf.git] / Examples / TCPClientServer / server.cc

diff --git a/Examples/TCPClientServer/server.cc b/Examples/TCPClientServer/server.cc
index 54a2040..dacef47 100644 (file)
--- a/Examples/TCPClientServer/server.cc
+++ b/Examples/TCPClientServer/server.cc
@@ -1,8 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,11 +28,9 @@
 // Custom includes
 #include <string>
 #include <iostream>
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Socket/Protocols/INet/TCPSocketHandle.hh"
-#include "Socket/Protocols/INet/INetAddressing.hh"
-
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Socket/Protocols/INet.hh>
 
 class Server
 {
@@ -51,12 +50,12 @@ public:
     }
          
 private:
-    void accept(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
+    void accept(senf::Scheduler::EventId event)
     {
         senf::TCPv4ClientSocketHandle clientSock (serverSock.accept());
         senf::Scheduler::instance().add(
             clientSock,
-            senf::membind(&Server::readFromClient, this),
+            boost::bind(&Server::readFromClient, this, clientSock, _1),
             senf::Scheduler::EV_READ);
     }