Emacs/cc-ide: More robust function movement

[mediaserv.git] / Server / HTTPConnection.hh

diff --git a/Server/HTTPConnection.hh b/Server/HTTPConnection.hh
index e8b097e..76d17b0 100644 (file)
--- a/Server/HTTPConnection.hh
+++ b/Server/HTTPConnection.hh
@@ -13,6 +13,7 @@
 #include "Utils/intrusive_refcount.hh"
 #include "Scheduler/ReadHelper.hh"
 #include "Scheduler/WriteHelper.hh"
+#include "Socket/Protocols/INet/INetAddressing.hh"
 #include "HTTPLogger.hh"
 #include "HTTPRequest.hh"
 
@@ -26,18 +27,20 @@ namespace mediaserv {
     class StreamConnection;
 
     class HTTPConnection
-       : public satcom::lib::intrusive_refcount
+       : public senf::intrusive_refcount
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
        typedef boost::intrusive_ptr<HTTPConnection> ptr;
-       typedef satcom::lib::ClientSocketHandle<
-           satcom::lib::MakeSocketPolicy<satcom::lib::ConnectedCommunicationPolicy,
-                                         satcom::lib::StreamFramingPolicy,
-                                         satcom::lib::ReadablePolicy,
-                                         satcom::lib::WriteablePolicy>::policy> ClientHandle;
+       typedef senf::ClientSocketHandle<
+           senf::MakeSocketPolicy<senf::ConnectedCommunicationPolicy,
+                                         senf::StreamFramingPolicy,
+                                         senf::ReadablePolicy,
+                                         senf::WriteablePolicy,
+                                         senf::INet4AddressingPolicy
+                                  >::policy> ClientHandle;
 
        static const unsigned MaxRequestSize = 16384;
        static const unsigned StreamBufferMSecs = 4000;
@@ -57,8 +60,8 @@ namespace mediaserv {
     protected:
 
     private:
-       void handleRequest(satcom::lib::ReadHelper<ClientHandle>::ptr);
-       void startStream(satcom::lib::WriteHelper<ClientHandle>::ptr);
+       void handleRequest(senf::ReadHelper<ClientHandle>::ptr);
+       void startStream(senf::WriteHelper<ClientHandle>::ptr);
        
        ClientHandle client_;
        SimpleHTTPServer & server_;