Better SENF configuration support (local_config.hh)

[senf.git] / Socket / ClientSocketHandle.ct

diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 5e3a150..6ad4040 100644 (file)
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -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;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -166,4 +170,6 @@ prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: