feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Fix conditional of workaround.

Browse Source
This commit is contained in:
Kohei Takahashi
2015-11-14 23:32:46 +09:00
parent 1c05cfc795
commit 87fffbead3
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/algorithm/iteration/detail/fold.hpp
View File

@ -100,9 +100,9 @@ FUSION_HASH endif
struct BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<SeqSize,It,State,F struct BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<SeqSize,It,State,F
, typename boost::enable_if_has_type< , typename boost::enable_if_has_type<
#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, == 1500) FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, >= 1500)
#endif #endif
#if BOOST_WORKAROUND(BOOST_MSVC, == 1500) || \ #if BOOST_WORKAROUND(BOOST_MSVC, >= 1500) || \
(defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)) (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
// Following SFINAE enables to avoid MSVC 9's partial specialization // Following SFINAE enables to avoid MSVC 9's partial specialization
// ambiguous bug but MSVC 8 don't compile, and moreover MSVC 8 style // ambiguous bug but MSVC 8 don't compile, and moreover MSVC 8 style

2
include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp
View File

@ -38,7 +38,7 @@ namespace boost { namespace fusion
template<int SeqSize, typename It, typename State, typename F> template<int SeqSize, typename It, typename State, typename F>
struct result_of_it_fold<SeqSize,It,State,F struct result_of_it_fold<SeqSize,It,State,F
, typename boost::enable_if_has_type< , typename boost::enable_if_has_type<
# if BOOST_WORKAROUND (BOOST_MSVC, == 1500) # if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)

2
include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
View File

@ -37,7 +37,7 @@ namespace boost { namespace fusion
template<int SeqSize, typename It, typename State, typename F> template<int SeqSize, typename It, typename State, typename F>
struct result_of_it_iter_fold<SeqSize,It,State,F struct result_of_it_iter_fold<SeqSize,It,State,F
, typename boost::enable_if_has_type< , typename boost::enable_if_has_type<
# if BOOST_WORKAROUND (BOOST_MSVC, == 1500) # if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)

2
include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
View File

@ -37,7 +37,7 @@ namespace boost { namespace fusion
template<int SeqSize, typename It, typename State, typename F> template<int SeqSize, typename It, typename State, typename F>
struct result_of_it_reverse_fold<SeqSize,It,State,F struct result_of_it_reverse_fold<SeqSize,It,State,F
, typename boost::enable_if_has_type< , typename boost::enable_if_has_type<
# if BOOST_WORKAROUND (BOOST_MSVC, == 1500) # if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)

2
include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
View File

@ -37,7 +37,7 @@ namespace boost { namespace fusion
template<int SeqSize, typename It, typename State, typename F> template<int SeqSize, typename It, typename State, typename F>
struct result_of_it_reverse_iter_fold<SeqSize,It,State,F struct result_of_it_reverse_iter_fold<SeqSize,It,State,F
, typename boost::enable_if_has_type< , typename boost::enable_if_has_type<
# if BOOST_WORKAROUND (BOOST_MSVC, == 1500) # if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)