diff options
Diffstat (limited to 'boost/fusion/container/deque/detail/keyed_element.hpp')
| -rw-r--r-- | boost/fusion/container/deque/detail/keyed_element.hpp | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/boost/fusion/container/deque/detail/keyed_element.hpp b/boost/fusion/container/deque/detail/keyed_element.hpp index 05258820dc..24b5979d2d 100644 --- a/boost/fusion/container/deque/detail/keyed_element.hpp +++ b/boost/fusion/container/deque/detail/keyed_element.hpp @@ -27,7 +27,7 @@ namespace boost { namespace fusion { namespace detail void get(); template<typename It> - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static nil_keyed_element from_iterator(It const&) { @@ -43,7 +43,7 @@ namespace boost { namespace fusion { namespace detail using Rest::get; template <typename It> - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED static keyed_element from_iterator(It const& it) { @@ -51,61 +51,62 @@ namespace boost { namespace fusion { namespace detail *it, base::from_iterator(fusion::next(it))); } - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element(keyed_element const& rhs) : Rest(rhs.get_base()), value_(rhs.value_) {} #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element(keyed_element&& rhs) - : Rest(std::forward<Rest>(rhs.forward_base())) - , value_(std::forward<Value>(rhs.value_)) + : Rest(BOOST_FUSION_FWD_ELEM(Rest, rhs.forward_base())) + , value_(BOOST_FUSION_FWD_ELEM(Value, rhs.value_)) {} #endif template <typename U, typename Rst> - BOOST_FUSION_GPU_ENABLED - keyed_element(keyed_element<Key, U, Rst> const& rhs) + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + keyed_element(keyed_element<Key, U, Rst> const& rhs + , typename enable_if<is_convertible<U, Value> >::type* = 0) : Rest(rhs.get_base()), value_(rhs.value_) {} #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) #endif - BOOST_FUSION_GPU_ENABLED - Rest& get_base() + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED + Rest& get_base() BOOST_NOEXCEPT { return *this; } - BOOST_FUSION_GPU_ENABLED - Rest const& get_base() const + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + Rest const& get_base() const BOOST_NOEXCEPT { return *this; } #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - BOOST_FUSION_GPU_ENABLED - Rest&& forward_base() + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED + Rest&& forward_base() BOOST_NOEXCEPT { - return std::forward<Rest>(*static_cast<Rest*>(this)); + return BOOST_FUSION_FWD_ELEM(Rest, *static_cast<Rest*>(this)); } #endif - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED typename cref_result<Value>::type get(Key) const { return value_; } - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED typename ref_result<Value>::type get(Key) { return value_; } - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element( typename detail::call_param<Value>::type value , Rest const& rest) @@ -113,20 +114,20 @@ namespace boost { namespace fusion { namespace detail {} #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element(Value&& value, Rest&& rest) - : Rest(std::forward<Rest>(rest)) - , value_(std::forward<Value>(value)) + : Rest(BOOST_FUSION_FWD_ELEM(Rest, rest)) + , value_(BOOST_FUSION_FWD_ELEM(Value, value)) {} #endif - BOOST_FUSION_GPU_ENABLED + BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element() : Rest(), value_() {} template<typename U, typename Rst> - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element& operator=(keyed_element<Key, U, Rst> const& rhs) { base::operator=(static_cast<Rst const&>(rhs)); // cast for msvc-7.1 @@ -134,7 +135,7 @@ namespace boost { namespace fusion { namespace detail return *this; } - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element& operator=(keyed_element const& rhs) { base::operator=(rhs); @@ -143,11 +144,11 @@ namespace boost { namespace fusion { namespace detail } #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED keyed_element& operator=(keyed_element&& rhs) { base::operator=(std::forward<keyed_element>(rhs)); - value_ = std::forward<Value>(rhs.value_); + value_ = BOOST_FUSION_FWD_ELEM(Value, rhs.value_); return *this; } #endif |