boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-29 20:17:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed for msvc + gcc (all regresions ok)

Browse Source 
[SVN r35271]
This commit is contained in:
Joel de Guzman
2006-09-22 06:31:17 +00:00
parent 46134407cf
commit da23c8a4cc
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/fusion/iterator/deref.hpp
View File

@ -37,8 +37,7 @@ namespace boost { namespace fusion
deref(Iterator const& i) deref(Iterator const& i)
{ {
typedef result_of::deref<Iterator> deref_meta; typedef result_of::deref<Iterator> deref_meta;
typename deref_meta::type result(deref_meta::call(i)); return deref_meta::call(i);
return result;
} }
template <typename Iterator> template <typename Iterator>

3
include/boost/fusion/iterator/detail/distance.hpp
View File

@ -56,8 +56,7 @@ namespace boost { namespace fusion { namespace distance_detail
static type static type
call(First const&, Last const&) call(First const&, Last const&)
{ {
static type result; return type();
return result;
} }
}; };

4
include/boost/fusion/sequence/container/list/cons.hpp
View File

@ -87,7 +87,7 @@ namespace boost { namespace fusion
template <typename Sequence> template <typename Sequence>
explicit cons( explicit cons(
Sequence const& seq Sequence const& seq
#if defined(BOOST_MSVC) //~ #if defined(BOOST_MSVC)
// VC++ gets confused when RHS is a derived type. It fails to call // VC++ gets confused when RHS is a derived type. It fails to call
// the copy ctor and attempts to call this templated constructor instead. // the copy ctor and attempts to call this templated constructor instead.
, typename disable_if< , typename disable_if<
@ -96,7 +96,7 @@ namespace boost { namespace fusion
, is_convertible<Sequence, Car> // use copy to car instead , is_convertible<Sequence, Car> // use copy to car instead
> >
>::type* dummy = 0 >::type* dummy = 0
#endif //~ #endif
) )
: car(*fusion::begin(seq)) : car(*fusion::begin(seq))
, cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {} , cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {}