X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FClientSocketHandle.cti;h=66d8d83f4696f01c80e917cd205ff192b87b8482;hb=refs%2Fheads%2Fmaster;hp=76e6d73f0c27f3e9df14bab0ed8b170e790247ee;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/ClientSocketHandle.cti b/senf/Socket/ClientSocketHandle.cti
index 76e6d73..66d8d83 100644
--- a/senf/Socket/ClientSocketHandle.cti
+++ b/senf/Socket/ClientSocketHandle.cti
@@ -2,23 +2,28 @@
 //
 // 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief ClientSocketHandle inline template implementation
@@ -30,9 +35,9 @@
 #include <typeinfo>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::ReadRange<Policy,ForwardWritableRange,true>
 
 template <class Handle, class ForwardWritableRange>
@@ -60,7 +65,7 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address
                 - ic);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::WriteRange<Handle, ForwardReadableRange, true>
 
 template <class Handle, class ForwardReadableRange>
@@ -91,10 +96,10 @@ writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address
     return i;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ClientSocketHandle<Policy>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // structors
 
 template <class SPolicy>
@@ -145,18 +150,18 @@ senf::ClientSocketHandle<SPolicy>::operator=(ClientSocketHandle<OtherPolicy> oth
 {}
 #endif
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // reading and writing
 
 // senf::ClientSocketHandle<SPolicy>::read
 
 #ifndef DOXYGEN
+
 template <class SPolicy>
 template <class ForwardWritableRange>
-prefix_ typename boost::range_iterator<ForwardWritableRange>::type
-senf::ClientSocketHandle<SPolicy>::
-read(ForwardWritableRange const & range,
-     typename boost::disable_if< boost::is_convertible<ForwardWritableRange,unsigned> >::type *)
+prefix_ typename boost::disable_if<boost::is_convertible<ForwardWritableRange,unsigned>,
+typename boost::range_iterator<ForwardWritableRange>::type>::type
+senf::ClientSocketHandle<SPolicy>::read(ForwardWritableRange const & range)
 {
     return detail::ReadRange<
         ClientSocketHandle<SPolicy>,
@@ -178,10 +183,9 @@ read(ForwardWritableRange const & range)
 #ifndef DOXYGEN
 template <class SPolicy>
 template <class ForwardWritableRange>
-prefix_ typename boost::range_iterator<ForwardWritableRange>::type
-senf::ClientSocketHandle<SPolicy>::
-read(ForwardWritableRange & range,
-     typename boost::disable_if< boost::is_convertible<ForwardWritableRange,unsigned> >::type *)
+prefix_ typename boost::disable_if<boost::is_convertible<ForwardWritableRange,unsigned>,
+typename boost::range_iterator<ForwardWritableRange>::type>::type
+senf::ClientSocketHandle<SPolicy>::read(ForwardWritableRange & range)
 {
     return detail::ReadRange<
         ClientSocketHandle<SPolicy>,
@@ -289,7 +293,7 @@ prefix_ char const * senf::ClientSocketHandle<SPolicy>::writeto(AddressParam add
     return start + SPolicy::WritePolicy::writeto(*this, addr, start, end-start);
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // addressing
 
 // senf::ClientSocketHandle<SPolicy>::peer
@@ -350,7 +354,7 @@ prefix_ void senf::ClientSocketHandle<SPolicy>::bind(AddressParam addr)
     SPolicy::AddressingPolicy::bind(*this, addr);
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // Casting
 
 template <class SPolicy>
@@ -370,7 +374,7 @@ senf::ClientSocketHandle<SPolicy>::cast_dynamic(FileHandle handle)
     return cast_static(handle);
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // State information
 
 template <class SPolicy>
@@ -392,7 +396,7 @@ prefix_ std::string senf::ClientSocketHandle<SPolicy>::dumpState(unsigned lod)
     return detail::dumpState(map);
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_