Ticket #3583: fusion.diff

boost/fusion/view/single_view/detail/deref_impl.hpp

@@ -10 +10 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/type_traits/is_const.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/add_reference.hpp>
 
 namespace boost { namespace fusion
 {
@@ -26 +29 @@
             template <typename Iterator>
             struct apply
             {
-                typedef typename Iterator::value_type type;
+                typedef typename
+                    add_reference<
+                        typename mpl::if_<
+                            is_const<typename Iterator::single_view_type>
+                          , typename add_const<typename Iterator::single_view_type::value_type>::type
+                          , typename Iterator::single_view_type::value_type
+                        >::type
+                    >::type
+                type;
     
                 static type
                 call(Iterator const& i)
                 {
-                    return i.val;
+                    return i.view.val;
                 }
             };
         };

boost/fusion/view/single_view/single_view_iterator.hpp

@@ -32 +32 @@
     {
         typedef single_view_iterator_tag fusion_tag;
         typedef forward_traversal_tag category;
-        typedef typename SingleView::value_type value_type;
         typedef SingleView single_view_type;
 
-        explicit single_view_iterator(single_view_type const& view)
-            : val(view.val) {}
+        explicit single_view_iterator(single_view_type& view)
+            : view(view) {}
 
-        value_type val;
+        SingleView& view;
     };
 }}