[Boost-commit] svn:boost r4375

From: jefffaust_at_[hidden]
Date: 2007-05-31 01:32:31

Author: jefffaust
Date: 2007-05-31 01:32:26 EDT (Thu, 31 May 2007)
New Revision: 4375
URL: http://svn.boost.org/trac/boost/changeset/4375

Log:

Text files modified: 
   sandbox/explore/boost/explore/stream_container.hpp |    20 ++++++++++----------                    
   1 files changed, 10 insertions(+), 10 deletions(-)

Modified: sandbox/explore/boost/explore/stream_container.hpp
==============================================================================
--- sandbox/explore/boost/explore/stream_container.hpp	(original)
+++ sandbox/explore/boost/explore/stream_container.hpp	2007-05-31 01:32:26 EDT (Thu, 31 May 2007)
@@ -26,7 +26,7 @@
 
 namespace explore
 {
-    namespace detail 
+    namespace detail
     {
         BOOST_EXPLORE_INIT_STRING(separator, ", ")
         BOOST_EXPLORE_INIT_STRING(start, "[")
@@ -67,7 +67,7 @@
         str_typ assoc_end;
     };
 
-    namespace detail 
+    namespace detail
     {
         // manipulator function wrapper for 1 char/wchar_t argument.  When streamed, will run manipulator
         // function with argument.
@@ -201,15 +201,15 @@
     }
 
     template< typename IteratorT >
-    iterator_range_wrapper<IteratorT>
-        make_iterator_range(IteratorT Begin, IteratorT End) 
+    inline iterator_range_wrapper<IteratorT>
+    make_iterator_range(IteratorT Begin, IteratorT End)
     {
-        return as_container(boost::make_iterator_range(Begin, End));
+        return iterator_range_wrapper<IteratorT>(boost::make_iterator_range(Begin, End));
     }
 
     template< class ForwardRange >
     iterator_range_wrapper<BOOST_DEDUCED_TYPENAME boost::range_const_iterator<ForwardRange>::type>
-        make_iterator_range(const ForwardRange& r) 
+        make_iterator_range(const ForwardRange& r)
     {
         return as_container(boost::make_iterator_range(r));
     }
@@ -296,10 +296,10 @@
 
     // stream boost::iterator_range
     template<typename Elem, typename Tr, typename T>
-    std::basic_ostream<Elem, Tr>& operator<<(std::basic_ostream<Elem, Tr>& ostr, 
-        explore::iterator_range_wrapper<T>& r)
+    std::basic_ostream<Elem, Tr>& operator<<(std::basic_ostream<Elem, Tr>& ostr,
+        const iterator_range_wrapper<T>& r)
     {
-        return explore::stream_container(ostr, r.t.begin(), r.t.end(), explore::iterator_range_wrapper<T>::stream_type());
+        return stream_container(ostr, r.t.begin(), r.t.end(), typename iterator_range_wrapper<T>::stream_type());
     }
 
     // manipulator
@@ -348,7 +348,7 @@
     template<typename Elem, typename Tr>
     std::basic_ostream<Elem, Tr>& format_normal(std::basic_ostream<Elem, Tr>& ostr)
     {
-        get_stream_state<container_stream_state<Elem, Tr> >(ostr)->init<Elem>();
+        get_stream_state<container_stream_state<Elem, Tr> >(ostr)->template init<Elem>();
         return ostr;
     }