X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocolClientSocketHandle.cti;h=efdb9349a20592c3ddbc11391d04916a389a06e4;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=0f01b8899db8c68c0f303d29a442b5c6f9a3e68e;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Socket/ProtocolClientSocketHandle.cti b/Socket/ProtocolClientSocketHandle.cti
index 0f01b88..efdb934 100644
--- a/Socket/ProtocolClientSocketHandle.cti
+++ b/Socket/ProtocolClientSocketHandle.cti
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// 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
 // it under the terms of the GNU General Public License as published by
@@ -20,52 +20,63 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief ProtocolClientSocketHandle inline template
+        implementation
+ */
+
 // Definition of inline template functions
 
 //#include "ProtocolClientSocketHandle.ih"
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
 template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientSocketHandle()
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::
+ProtocolClientSocketHandle(senf::NoInit_t)
+{}
+
+template <class SocketProtocol>
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::ProtocolClientSocketHandle()
     : ClientSocketHandle<typename SocketProtocol::Policy>(
-        std::auto_ptr<satcom::lib::SocketProtocol>(new SocketProtocol()))
+        std::auto_ptr<senf::SocketBody>(new senf::ProtocolSocketBody<SocketProtocol>(false)))
 {
     this->protocol().init_client();
 }
 
-#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, "Socket/ProtocolClientSocketHandle.mpp", 2))
+#define BOOST_PP_ITERATION_PARAMS_1 (4, (1, 9, SENF_ABSOLUTE_INCLUDE_PATH(Socket/ProtocolClientSocketHandle.mpp), 2))
 #include BOOST_PP_ITERATE()
 
 template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>::
 ProtocolClientSocketHandle(FileHandle other, bool isChecked)
     : ClientSocketHandle<typename Protocol::Policy>(other, isChecked)
 {}
 
 template <class SocketProtocol>
-prefix_ SocketProtocol const &
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::protocol()
+prefix_ SocketProtocol &
+senf::ProtocolClientSocketHandle<SocketProtocol>::protocol()
 {
-    BOOST_ASSERT( dynamic_cast<SocketProtocol const *>(&this->body().protocol()) );
-    // Need dynamic_cast here, since satcom::lib::SocketProtocol is a
+    SENF_ASSERT( dynamic_cast<SocketProtocol *>(&this->body().protocol()) );
+    // Need dynamic_cast here, since senf::SocketProtocol is a
     // virtual base
-    return dynamic_cast<SocketProtocol const &>(this->body().protocol());
+    return dynamic_cast<SocketProtocol &>(this->body().protocol());
 }
 
 template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>
+senf::ProtocolClientSocketHandle<SocketProtocol>::cast_static(FileHandle handle)
 {
     return ProtocolClientSocketHandle(handle,true);
 }
 
 template <class SocketProtocol>
-prefix_ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
+prefix_ senf::ProtocolClientSocketHandle<SocketProtocol>
+senf::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle handle)
 {
     ClientSocketHandle<typename SocketProtocol::Policy> h(
         ClientSocketHandle<typename SocketProtocol::Policy>::cast_dynamic(handle));
@@ -76,7 +87,7 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::cast_dynamic(FileHandle
 
 template <class SocketProtocol>
 prefix_ void
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap & map,
+senf::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap & map,
                                                                unsigned lod)
 {
     map["handle"] = prettyName(typeid(*this));
@@ -85,7 +96,7 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::state(SocketStateMap &
 
 template <class SocketProtocol>
 prefix_ std::string
-satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
+senf::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
 {
     SocketStateMap map;
     state(map,lod);
@@ -98,5 +109,10 @@ satcom::lib::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: