Ticket #5784: stream.patch

File stream.patch, 2.1 KB (added by gredner@…, 11 years ago)

Patch against current trunk

  • boost/fusion/support/pair.hpp

     
    88#if !defined(FUSION_PAIR_07222005_1203)
    99#define FUSION_PAIR_07222005_1203
    1010
     11#include <iosfwd>
     12
    1113#include <boost/fusion/support/detail/access.hpp>
    1214#include <boost/fusion/support/detail/as_fusion_element.hpp>
    1315#include <boost/config.hpp>
     
    7476        return pair<First, typename detail::as_fusion_element<Second>::type>(val);
    7577    }
    7678
    77     template <typename OStream, typename First, typename Second>
    78     inline OStream&
    79     operator<<(OStream& os, pair<First, Second> const& p)
     79    template <typename First, typename Second>
     80    inline std::ostream&
     81    operator<<(std::ostream& os, pair<First, Second> const& p)
    8082    {
    8183        os << p.second;
    8284        return os;
    8385    }
    8486
    85     template <typename IStream, typename First, typename Second>
    86     inline IStream&
    87     operator>>(IStream& is, pair<First, Second>& p)
     87    template <typename First, typename Second>
     88    inline std::istream&
     89    operator>>(std::istream& is, pair<First, Second>& p)
    8890    {
    8991        is >> p.second;
    9092        return is;
  • boost/fusion/support/unused.hpp

     
    77#if !defined(BOOST_FUSION_SUPPORT_UNUSED_20070305_1038)
    88#define BOOST_FUSION_SUPPORT_UNUSED_20070305_1038
    99
     10#include <iosfwd>
     11
    1012#include <boost/config.hpp>
    1113#if defined(BOOST_MSVC)
    1214# pragma warning(push)
     
    6567        };
    6668    }
    6769
    68     template <typename Out>
    69     inline Out& operator<<(Out& out, detail::unused_only const&)
     70    inline std::ostream& operator<<(std::ostream& out, detail::unused_only const&)
    7071    {
    7172        return out;
    7273    }
    7374
    74     template <typename In>
    75     inline In& operator>>(In& in, unused_type&)
     75    inline std::istream& operator>>(std::istream& in, unused_type&)
    7676    {
    7777        return in;
    7878    }