X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.ct;h=a9d78dc490dd4c283b7d4e78de8dd42f11eadc9f;hb=51044eb18f034c1a059ffe2fb109a422c1cbe251;hp=b51abbd6a39c620761bff53fad16727017a5b51a;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index b51abbd..a9d78dc 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -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>
+// 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
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <algorithm>
-#include "Utils/Buffer.hh"
+#include "../Utils/Buffer.hh"
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
@@ -60,25 +60,29 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address
 // senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>
 
 template <class Handle, class ForwardReadableRange, bool IsContiguous>
-prefix_ typename boost::range_iterator<ForwardReadableRange>::type
+prefix_ typename boost::range_const_iterator<ForwardReadableRange>::type
 senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>::
 write(Handle & handle, ForwardReadableRange & range)
 {
     typename boost::range_size<ForwardReadableRange>::type nwrite (boost::size(range));
+    typename boost::range_const_iterator<ForwardReadableRange>::type i (boost::begin(range));
     SENF_SCOPED_BUFFER(char, buffer, nwrite);
-    std::copy(boost::begin(range), boost::end(range), buffer);
-    return handle.write(std::make_pair(buffer, buffer+nwrite));
+    std::copy(i, boost::end(range), buffer);
+    std::advance(i, handle.write(std::make_pair(buffer, buffer+nwrite)) - buffer);
+    return i;
 }
 
 template <class Handle, class ForwardReadableRange, bool IsContiguous>
-prefix_ typename boost::range_iterator<ForwardReadableRange>::type
+prefix_ typename boost::range_const_iterator<ForwardReadableRange>::type
 senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>::
 writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address const & addr)
 {
     typename boost::range_size<ForwardReadableRange>::type nwrite (boost::size(range));
+    typename boost::range_const_iterator<ForwardReadableRange>::type i (boost::begin(range));
     SENF_SCOPED_BUFFER(char, buffer, nwrite);
-    std::copy(boost::begin(range), boost::end(range), buffer);
-    return handle.writeto(std::make_pair(buffer, buffer+nwrite), addr);
+    std::copy(i, boost::end(range), buffer);
+    std::advance(i, handle.writeto(std::make_pair(buffer, buffer+nwrite), addr) - buffer);
+    return i;
 }
 
 ///////////////////////////////////////////////////////////////////////////