Merge various hotfixes into develop.

This commit is contained in:
Kohei Takahashi
2014-11-01 22:00:45 +09:00
3 changed files with 32 additions and 5 deletions

View File

@ -392,9 +392,9 @@
typename boost_fusion_detail_It1::index \
>::type type; \
\
BOOST_FUSION_GPU_ENABLED \
static type call(boost_fusion_detail_It1 const& it1, \
boost_fusion_detail_It2 const& it2) \
BOOST_FUSION_GPU_ENABLED \
static type call(boost_fusion_detail_It1 const& /* it1 */, \
boost_fusion_detail_It2 const& /* it2 */) \
{ \
return type(); \
} \

View File

@ -38,12 +38,12 @@ namespace boost { namespace fusion { namespace detail
template <typename Iterator>
BOOST_FUSION_GPU_ENABLED
map_impl(Iterator const& iter, map_impl_from_iterator)
map_impl(Iterator const&, map_impl_from_iterator)
{}
template <typename Iterator>
BOOST_FUSION_GPU_ENABLED
void assign(Iterator const& iter, map_impl_from_iterator)
void assign(Iterator const&, map_impl_from_iterator)
{}
BOOST_FUSION_GPU_ENABLED