diff options
Diffstat (limited to 'boost/fusion/container/set/set.hpp')
| -rw-r--r-- | boost/fusion/container/set/set.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/boost/fusion/container/set/set.hpp b/boost/fusion/container/set/set.hpp index e1d019a77b..65a080b0ab 100644 --- a/boost/fusion/container/set/set.hpp +++ b/boost/fusion/container/set/set.hpp @@ -8,6 +8,7 @@ #define FUSION_SET_09162005_1104 #include <boost/fusion/support/config.hpp> +#include <boost/fusion/support/is_sequence.hpp> #include <boost/fusion/support/sequence_base.hpp> #include <boost/fusion/support/category_of.hpp> #include <boost/fusion/support/detail/access.hpp> @@ -22,6 +23,7 @@ #include <boost/fusion/container/vector/vector.hpp> #include <boost/mpl/identity.hpp> #include <boost/mpl/bool.hpp> +#include <boost/core/enable_if.hpp> #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES) #include <boost/fusion/container/set/detail/preprocessed/set.hpp> @@ -63,19 +65,20 @@ namespace boost { namespace fusion typedef typename storage_type::size size; - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED set() : data() {} template <typename Sequence> - BOOST_FUSION_GPU_ENABLED - set(Sequence const& rhs) + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + set(Sequence const& rhs + , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0) : data(rhs) {} #include <boost/fusion/container/set/detail/set_forward_ctor.hpp> template <typename T> - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED set& operator=(T const& rhs) { @@ -83,9 +86,9 @@ namespace boost { namespace fusion return *this; } - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED storage_type& get_data() { return data; } - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED storage_type const& get_data() const { return data; } private: |