[Boost-commit] svn:boost r86251 - in branches/release/boost/fusion: . sequence/intrinsic/detail

Subject: [Boost-commit] svn:boost r86251 - in branches/release/boost/fusion: . sequence/intrinsic/detail
From: joel_at_[hidden]
Date: 2013-10-11 21:35:27

Author: djowel
Date: 2013-10-11 21:35:27 EDT (Fri, 11 Oct 2013)
New Revision: 86251
URL: http://svn.boost.org/trac/boost/changeset/86251

Log:
Merged 84441 to release

Properties modified: 
   branches/release/boost/fusion/   (props changed)
Text files modified: 
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp |     6 +++---                                  
   branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp   |     6 +++---                                  
   2 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp	Fri Oct 11 19:23:26 2013	(r86250)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp	2013-10-11 21:35:27 EDT (Fri, 11 Oct 2013)	(r86251)
@@ -22,19 +22,19 @@
     //    return make_segmented_iterator( segmented_begin_impl( seq, nil_ ) );
     //}
 
-    template <typename Sequence, typename Nil = fusion::nil_>
+    template <typename Sequence, typename Nil_ = fusion::nil_>
     struct segmented_begin
     {
         typedef
             segmented_iterator<
-                typename segmented_begin_impl<Sequence, Nil>::type
+                typename segmented_begin_impl<Sequence, Nil_>::type
             >
         type;
 
         static type call(Sequence& seq)
         {
             return type(
-                segmented_begin_impl<Sequence, Nil>::call(seq, Nil()));
+                segmented_begin_impl<Sequence, Nil_>::call(seq, Nil_()));
         }
     };
 

Modified: branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
==============================================================================
--- branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp	Fri Oct 11 19:23:26 2013	(r86250)
+++ branches/release/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp	2013-10-11 21:35:27 EDT (Fri, 11 Oct 2013)	(r86251)
@@ -18,19 +18,19 @@
     //    return make_segmented_iterator( segmented_end_impl( seq ) );
     //}
 
-    template <typename Sequence, typename Nil = fusion::nil_>
+    template <typename Sequence, typename Nil_ = fusion::nil_>
     struct segmented_end
     {
         typedef
             segmented_iterator<
-                typename segmented_end_impl<Sequence, Nil>::type
+                typename segmented_end_impl<Sequence, Nil_>::type
             >
         type;
 
         static type call(Sequence & seq)
         {
             return type(
-                segmented_end_impl<Sequence, Nil>::call(seq, Nil()));
+                segmented_end_impl<Sequence, Nil_>::call(seq, Nil_()));
         }
     };