[Boost-commit] svn:boost r73774 - trunk/boost/fusion/support

Subject: [Boost-commit] svn:boost r73774 - trunk/boost/fusion/support
From: joel_at_[hidden]
Date: 2011-08-15 06:53:14

Author: djowel
Date: 2011-08-15 06:53:13 EDT (Mon, 15 Aug 2011)
New Revision: 73774
URL: http://svn.boost.org/trac/boost/changeset/73774

Log:
Fix Ticket #5784
Text files modified: 
   trunk/boost/fusion/support/pair.hpp   |    14 ++++++++------                          
   trunk/boost/fusion/support/unused.hpp |     8 ++++----                                
   2 files changed, 12 insertions(+), 10 deletions(-)

Modified: trunk/boost/fusion/support/pair.hpp
==============================================================================
--- trunk/boost/fusion/support/pair.hpp	(original)
+++ trunk/boost/fusion/support/pair.hpp	2011-08-15 06:53:13 EDT (Mon, 15 Aug 2011)
@@ -8,6 +8,8 @@
 #if !defined(FUSION_PAIR_07222005_1203)
 #define FUSION_PAIR_07222005_1203
 
+#include <iosfwd>
+
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/config.hpp>
@@ -74,17 +76,17 @@
         return pair<First, typename detail::as_fusion_element<Second>::type>(val);
     }
 
-    template <typename OStream, typename First, typename Second>
-    inline OStream&
-    operator<<(OStream& os, pair<First, Second> const& p)
+    template <typename First, typename Second>
+    inline std::ostream&
+    operator<<(std::ostream& os, pair<First, Second> const& p)
     {
         os << p.second;
         return os;
     }
 
-    template <typename IStream, typename First, typename Second>
-    inline IStream&
-    operator>>(IStream& is, pair<First, Second>& p)
+    template <typename First, typename Second>
+    inline std::istream&
+    operator>>(std::istream& is, pair<First, Second>& p)
     {
         is >> p.second;
         return is;

Modified: trunk/boost/fusion/support/unused.hpp
==============================================================================
--- trunk/boost/fusion/support/unused.hpp	(original)
+++ trunk/boost/fusion/support/unused.hpp	2011-08-15 06:53:13 EDT (Mon, 15 Aug 2011)
@@ -7,6 +7,8 @@
 #if !defined(BOOST_FUSION_SUPPORT_UNUSED_20070305_1038)
 #define BOOST_FUSION_SUPPORT_UNUSED_20070305_1038
 
+#include <iosfwd>
+
 #include <boost/config.hpp>
 #if defined(BOOST_MSVC)
 # pragma warning(push)
@@ -65,14 +67,12 @@
         };
     }
 
-    template <typename Out>
-    inline Out& operator<<(Out& out, detail::unused_only const&)
+    inline std::ostream& operator<<(std::ostream& out, detail::unused_only const&)
     {
         return out;
     }
 
-    template <typename In>
-    inline In& operator>>(In& in, unused_type&)
+    inline std::istream& operator>>(std::istream& in, unused_type&)
     {
         return in;
     }