diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-07-16 00:46:11 +0400 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-07-16 00:46:11 +0400 |
| commit | 1c682f0f0c5bd24c8886894daf87cba1b37645e4 (patch) | |
| tree | 72e01948956c4772c8c49747e1aefc136496864f /libcxx/include | |
| parent | 8e8618ae5c0cd2ca06d170e05154ff70e159044e (diff) | |
Make std::forward and std::move (and std::move_if_noexcept) constexpr in C++14
llvm-svn: 186344
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/tuple | 2 | ||||
| -rw-r--r-- | libcxx/include/type_traits | 6 | ||||
| -rw-r--r-- | libcxx/include/utility | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/include/tuple b/libcxx/include/tuple index d8a36e6e9f58..c7a1c1433c28 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -843,7 +843,7 @@ template <class _T1, class... _Args> inline _LIBCPP_INLINE_VISIBILITY constexpr _T1&& get(tuple<_Args...>&& __tup) noexcept { - return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(_VSTD::move<tuple<_Args...>>(__tup)); + return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(_VSTD::move(__tup)); } #endif diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index dd84abf20232..3d3ae5ea0b05 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -1466,7 +1466,7 @@ struct is_destructible #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY +inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 typename remove_reference<_Tp>::type&& move(_Tp&& __t) _NOEXCEPT { @@ -1475,7 +1475,7 @@ move(_Tp&& __t) _NOEXCEPT } template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY +inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 _Tp&& forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT { @@ -1483,7 +1483,7 @@ forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT } template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY +inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 _Tp&& forward(typename std::remove_reference<_Tp>::type&& __t) _NOEXCEPT { diff --git a/libcxx/include/utility b/libcxx/include/utility index 3e4b401f2d9a..46a8803a0158 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -38,10 +38,10 @@ template <class T, size_t N> void swap(T (&a)[N], T (&b)[N]) noexcept(noexcept(swap(*a, *b))); -template <class T> T&& forward(typename remove_reference<T>::type& t) noexcept; -template <class T> T&& forward(typename remove_reference<T>::type&& t) noexcept; +template <class T> T&& forward(typename remove_reference<T>::type& t) noexcept; // constexpr in C++14 +template <class T> T&& forward(typename remove_reference<T>::type&& t) noexcept; // constexpr in C++14 -template <class T> typename remove_reference<T>::type&& move(T&&) noexcept; +template <class T> typename remove_reference<T>::type&& move(T&&) noexcept; // constexpr in C++14 template <class T> typename conditional @@ -50,7 +50,7 @@ template <class T> const T&, T&& >::type - move_if_noexcept(T& x) noexcept; + move_if_noexcept(T& x) noexcept; // constexpr in C++14 template <class T> typename add_rvalue_reference<T>::type declval() noexcept; @@ -221,7 +221,7 @@ swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::v } template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY +inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES typename conditional < |