// $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
// Custom includes
#include <algorithm>
-#include "Utils/Buffer.hh"
+#include "../Utils/Buffer.hh"
#define prefix_
///////////////////////////////ct.p////////////////////////////////////////
// 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;
}
///////////////////////////////////////////////////////////////////////////
// senf::ClientSocketHandle<Policy>::read
-template <class Policy>
-prefix_ std::string senf::ClientSocketHandle<Policy>::read(unsigned limit)
+template <class SPolicy>
+prefix_ std::string senf::ClientSocketHandle<SPolicy>::read(unsigned limit)
{
std::string rv;
this->read(rv,limit);
return rv;
}
-template <class Policy>
+template <class SPolicy>
template <class Sequence>
-prefix_ void senf::ClientSocketHandle<Policy>::read(Sequence & container, unsigned limit)
+prefix_ void senf::ClientSocketHandle<SPolicy>::read(Sequence & container, unsigned limit)
{
unsigned nread (available());
if (limit>0 && nread>limit)
container.end());
}
-// senf::ClientSocketHandle<Policy>::readfrom
+// senf::ClientSocketHandle<SPolicy>::readfrom
-template <class Policy>
-prefix_ std::pair<std::string, typename Policy::AddressingPolicy::Address>
-senf::ClientSocketHandle<Policy>::readfrom(unsigned limit)
+template <class SPolicy>
+prefix_ std::pair<std::string, typename SPolicy::AddressingPolicy::Address>
+senf::ClientSocketHandle<SPolicy>::readfrom(unsigned limit)
{
std::string rv;
- typename Policy::AddressingPolicy::Address addr;
+ typename SPolicy::AddressingPolicy::Address addr;
this->readfrom(rv,addr,limit);
return std::make_pair(rv,addr);
}
-template <class Policy>
+template <class SPolicy>
template <class Sequence>
-prefix_ void senf::ClientSocketHandle<Policy>::readfrom(Sequence & container, Address & from,
+prefix_ void senf::ClientSocketHandle<SPolicy>::readfrom(Sequence & container, Address & from,
unsigned limit)
{
unsigned nread (available());
////////////////////////////////////////
// private members
-// senf::ClientSocketHandle<Policy>::available
+// senf::ClientSocketHandle<SPolicy>::available
-template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
+template <class SPolicy>
+prefix_ unsigned senf::ClientSocketHandle<SPolicy>::available()
{
unsigned nread = this->protocol().available();
if (nread == 0 && this->blocking()) {