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

Merge pull request #37 from ldionne/develop

Browse Source 
Use BOOST_CONSTEXPR instead of (nonexistant) BOOST_CXX14_CONSTEXPR. (reverted from commit 3280267ed4)
This commit is contained in:
Joel de Guzman
2014-11-12 07:35:19 +08:00
parent 3280267ed4
commit a2e32493bb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/fusion/iterator/basic_iterator.hpp
View File

@ -132,7 +132,7 @@ namespace boost { namespace fusion
{} {}
template<typename OtherSeq> template<typename OtherSeq>
BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
basic_iterator& basic_iterator&
operator=(basic_iterator<Tag,Category,OtherSeq,Index> const& it) operator=(basic_iterator<Tag,Category,OtherSeq,Index> const& it)
{ {

4
include/boost/fusion/sequence/intrinsic/swap.hpp
View File

@ -40,7 +40,7 @@ namespace boost { namespace fusion {
}; };
template<typename Elem> template<typename Elem>
BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
void operator()(Elem const& e) const void operator()(Elem const& e) const
{ {
using std::swap; using std::swap;
@ -50,7 +50,7 @@ namespace boost { namespace fusion {
} }
template<typename Seq1, typename Seq2> template<typename Seq1, typename Seq2>
BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
typename enable_if<mpl::and_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >, void>::type typename enable_if<mpl::and_<traits::is_sequence<Seq1>, traits::is_sequence<Seq2> >, void>::type
swap(Seq1& lhs, Seq2& rhs) swap(Seq1& lhs, Seq2& rhs)
{ {