From e08a1084717c12b9b32decd7eafed4c297dbb985 Mon Sep 17 00:00:00 2001 From: Jonathan Turkanis Date: Wed, 2 Feb 2005 06:46:54 +0000 Subject: [PATCH] removed redundant implementation for BROKEN_OVERLOAD_RESOLUTION [SVN r27019] --- include/boost/iostreams/detail/push.hpp | 43 +------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/include/boost/iostreams/detail/push.hpp b/include/boost/iostreams/detail/push.hpp index 60597c7..866fe77 100755 --- a/include/boost/iostreams/detail/push.hpp +++ b/include/boost/iostreams/detail/push.hpp @@ -45,8 +45,7 @@ BOOST_IOSTREAMS_PUSH_ARGS() ); \ /**/ -#ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //-------------------------// -# define BOOST_IOSTREAMS_DEFINE_PUSH_IMPL(name, mode, ch, helper, has_return, result) \ +#define BOOST_IOSTREAMS_DEFINE_PUSH_IMPL(name, mode, ch, helper, has_return, result) \ template \ BOOST_PP_EXPR_IF(has_return, result) \ name(::std::basic_streambuf& sb BOOST_IOSTREAMS_PUSH_PARAMS()) \ @@ -84,45 +83,5 @@ { this->helper( ::boost::iostreams::detail::resolve(t) \ BOOST_IOSTREAMS_PUSH_ARGS() ); } \ /**/ -#else // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //----------------// -# define BOOST_IOSTREAMS_DEFINE_PUSH_IMPL(name, mode, ch, helper, has_return, result) \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(::std::basic_streambuf& sb BOOST_IOSTREAMS_PUSH_PARAMS()) \ - { BOOST_IOSTREAMS_ADAPT_STREAM(mode, ch, sb, helper, has_return); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(::std::basic_istream& is BOOST_IOSTREAMS_PUSH_PARAMS()) \ - { BOOST_STATIC_ASSERT((!is_convertible::value)); \ - BOOST_IOSTREAMS_ADAPT_STREAM(mode, ch, is, helper, has_return); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(::std::basic_ostream& os BOOST_IOSTREAMS_PUSH_PARAMS()) \ - { BOOST_STATIC_ASSERT((!is_convertible::value)); \ - BOOST_IOSTREAMS_ADAPT_STREAM(mode, ch, os, helper, has_return); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(::std::basic_iostream& io BOOST_IOSTREAMS_PUSH_PARAMS()) \ - { BOOST_IOSTREAMS_ADAPT_STREAM(mode, ch, io, helper, has_return); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(const iterator_range& rng BOOST_IOSTREAMS_PUSH_PARAMS()) \ - { BOOST_PP_EXPR_IF(has_return, return) \ - this->helper( ::boost::iostreams::detail::range_adapter< \ - mode, iterator_range \ - >(rng) \ - BOOST_IOSTREAMS_PUSH_ARGS() ); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name( const ::boost::iostreams::detail::piper& p \ - BOOST_IOSTREAMS_PUSH_PARAMS() ) \ - { p.push(*this); } \ - template \ - BOOST_PP_EXPR_IF(has_return, result) \ - name(const T& t BOOST_IOSTREAMS_PUSH_PARAMS() BOOST_IOSTREAMS_DISABLE_IF_STREAM(T)) \ - { this->helper( ::boost::iostreams::detail::resolve(t) \ - BOOST_IOSTREAMS_PUSH_ARGS() ); } \ - /**/ -#endif // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //---------------// #endif // #ifndef BOOST_IOSTREAMS_DETAIL_PUSH_HPP_INCLUDED