From: g0dil Date: Mon, 23 Jul 2007 14:13:11 +0000 (+0000) Subject: Socket: Add boost::disable_if conditions to ClientSocketHandle::read members for... X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=0b68624566e2e5c855dde09254f3280c029d621d;p=senf.git Socket: Add boost::disable_if conditions to ClientSocketHandle::read members for disambiguation git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@339 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti index b3c1240..9650880 100644 --- a/Socket/ClientSocketHandle.cti +++ b/Socket/ClientSocketHandle.cti @@ -141,7 +141,9 @@ senf::ClientSocketHandle::operator=(ClientSocketHandle othe template template prefix_ typename boost::range_iterator::type -senf::ClientSocketHandle::read(ForwardWritableRange const & range) +senf::ClientSocketHandle:: +read(ForwardWritableRange const & range, + typename boost::disable_if< boost::is_convertible >::type *) { return detail::ReadRange< ClientSocketHandle, @@ -155,7 +157,9 @@ senf::ClientSocketHandle::read(ForwardWritableRange const & range) template template prefix_ typename boost::range_iterator::type -senf::ClientSocketHandle::read(ForwardWritableRange & range) +senf::ClientSocketHandle:: +read(ForwardWritableRange & range, + typename boost::disable_if< boost::is_convertible >::type *) { return detail::ReadRange< ClientSocketHandle, diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh index 07f2069..befb826 100644 --- a/Socket/ClientSocketHandle.hh +++ b/Socket/ClientSocketHandle.hh @@ -30,6 +30,8 @@ // Custom includes #include #include +#include +#include #include "SocketHandle.hh" //#include "ClientSocketHandle.mpp" @@ -173,7 +175,8 @@ namespace senf { std::string read (unsigned limit=0); template typename boost::range_iterator::type - read (ForwardWritableRange const & range); + read (ForwardWritableRange const & range, + typename boost::disable_if< boost::is_convertible >::type * = 0); ///< Read data into range /**< Read data into the given range. At most boost::size(range) characters are read. The @@ -188,7 +191,8 @@ namespace senf { Boost.Range */ template typename boost::range_iterator::type - read (ForwardWritableRange & range); + read (ForwardWritableRange & range, + typename boost::disable_if< boost::is_convertible >::type * = 0); ///< Read data into range /**< \see read(ForwardWritableRange const &) \n read() \n