Ticket #2103: 2103.patch

boost/optional/optional_fwd.hpp

@@ -12 +12 @@
 #ifndef BOOST_OPTIONAL_OPTIONAL_FWD_FLC_19NOV2002_HPP
 #define BOOST_OPTIONAL_OPTIONAL_FWD_FLC_19NOV2002_HPP
 
+#include <iosfwd>
+
 namespace boost {
 
 template<class T> class optional ;
 
+// TODO: Add BOOST_NO_TEMPLATED_STREAMS to config framework and change
+// this and other libraries that use BOOST_NO_TEMPLATED_STREAMS.
+#if defined __GNUC__
+#  if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97) 
+#    define BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
+#  endif
+#endif // __GNUC__
+
+#if defined (BOOST_OPTIONAL_NO_TEMPLATED_STREAMS)
+std::ostream& operator<<(std::ostream& out, optional<T> const& v);
+#else
+template<class CharType, class CharTrait, class T>
+std::basic_ostream<CharType, CharTrait>&
+operator<<(std::basic_ostream<CharType, CharTrait>& out, optional<T> const& v);
+#endif
+
 } // namespace boost
 
 #endif

boost/optional/optional_io.hpp

@@ -12 +12 @@
 #ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 #define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 
-#if defined __GNUC__
-#  if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97) 
-#    define BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
-#  endif
-#endif // __GNUC__
-
 #if defined BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
 #  include <iostream>
 #else 
@@ -32 +26 @@
 namespace boost
 {
 
-#if defined (BOOST_NO_TEMPLATED_STREAMS)
+#if defined (BOOST_OPTIONAL_NO_TEMPLATED_STREAMS)
 template<class T>
 inline std::ostream& operator<<(std::ostream& out, optional<T> const& v)
 #else
@@ -52 +46 @@
   return out;
 }
 
-#if defined (BOOST_NO_TEMPLATED_STREAMS)
+#if defined (BOOST_OPTIONAL_NO_TEMPLATED_STREAMS)
 template<class T>
 inline std::istream& operator>>(std::istream& in, optional<T>& v)
 #else