Subject: [Boost-commit] svn:boost r84441 - trunk/boost/fusion/sequence/intrinsic/detail
From: mcaisse_at_[hidden]
Date: 2013-05-22 21:02:53
Author: mjcaisse
Date: 2013-05-22 21:02:52 EDT (Wed, 22 May 2013)
New Revision: 84441
URL: http://svn.boost.org/trac/boost/changeset/84441
Log:
update fusion Nil template parameters to Nil_ to make ObjC happy. trac #5010
Text files modified:
trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp | 6 +++---
trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Modified: trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
==============================================================================
--- trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp 2013-05-22 21:02:52 EDT (Wed, 22 May 2013)
@@ -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: trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
==============================================================================
--- trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp 2013-05-22 21:02:52 EDT (Wed, 22 May 2013)
@@ -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_()));
}
};