X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocolServerSocketHandle.mpp;h=c17e5ebd9fd1daa432746d493d420a081b278abe;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=08d1993a946f3f5a4e05597cc49516fbf4755a94;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Socket/ProtocolServerSocketHandle.mpp b/Socket/ProtocolServerSocketHandle.mpp
index 08d1993..c17e5eb 100644
--- a/Socket/ProtocolServerSocketHandle.mpp
+++ b/Socket/ProtocolServerSocketHandle.mpp
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
  */
 
 #if !BOOST_PP_IS_ITERATING
-#ifndef MPP_PSSH__ProtocolServerSocketHandle_
+#ifndef MPP_SENF_Socket_ProtocolServerSocketHandle_
 
 // Custom includes
 #include <boost/preprocessor/iteration/iterate.hpp>
@@ -53,7 +53,7 @@
 // ProtocolServerSocketHandle (constructor) declaration
 
 template < mpp_PSSH_TemplateParameters() >
-ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() );
+explicit ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() );
 
 //////
 #elif BOOST_PP_ITERATION_FLAGS()==2
@@ -66,7 +66,7 @@ template < mpp_PSSH_TemplateParameters() >
 prefix_ senf::ProtocolServerSocketHandle<SocketProtocol>::
 ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
     : ServerSocketHandle<typename SocketProtocol::Policy>(
-        std::auto_ptr<senf::SocketProtocol>(new SocketProtocol()))
+        std::auto_ptr<senf::SocketBody>(new ProtocolSocketBody<SocketProtocol>(true)))
 {
     this->protocol().init_server( mpp_PSSH_CallParameters() );
 }
@@ -75,7 +75,7 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
 #endif
 #endif
 #if !BOOST_PP_IS_ITERATING
-#ifdef MPP_PSSH__ProtocolServerSocketHandle_
+#ifdef MPP_SENF_Socket_ProtocolServerSocketHandle_
 ///////////////////////////////////////////////////////////////////////////
 // Undefine local Macros
 
@@ -86,7 +86,7 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
 
 //////////////////////////////mpp_PSSH_.e////////////////////////////////////////
 #else
-#define MPP_PSSH__ProtocolServerSocketHandle_ 1
+#define MPP_SENF_Socket_ProtocolServerSocketHandle_ 1
 #endif
 #endif