|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70965 - trunk/boost/fusion/view/joint_view
From: joel_at_[hidden]
Date: 2011-04-03 19:20:14
Author: djowel
Date: 2011-04-03 19:20:13 EDT (Sun, 03 Apr 2011)
New Revision: 70965
URL: http://svn.boost.org/trac/boost/changeset/70965
Log:
MPL bug workaround. Fixes Trac ticket: #5411
Text files modified:
trunk/boost/fusion/view/joint_view/joint_view.hpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Modified: trunk/boost/fusion/view/joint_view/joint_view.hpp
==============================================================================
--- trunk/boost/fusion/view/joint_view/joint_view.hpp (original)
+++ trunk/boost/fusion/view/joint_view/joint_view.hpp 2011-04-03 19:20:13 EDT (Sun, 03 Apr 2011)
@@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
- Distributed under the Boost Software License, Version 1.0. (See accompanying
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#if !defined(FUSION_JOINT_VIEW_07162005_0140)
@@ -50,7 +50,9 @@
typedef typename result_of::end<Sequence1>::type last_type;
typedef typename result_of::begin<Sequence2>::type concat_type;
typedef typename result_of::end<Sequence2>::type concat_last_type;
- typedef typename mpl::plus<result_of::size<Sequence1>, result_of::size<Sequence2> >::type size;
+ typedef typename mpl::int_<
+ result_of::size<Sequence1>::value + result_of::size<Sequence2>::value>
+ size;
joint_view(Sequence1& in_seq1, Sequence2& in_seq2)
: seq1(in_seq1)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk