diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2017-05-25 14:20:26 +0000 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2017-05-25 14:20:26 +0000 |
commit | 5b7c98e52aad91e3fca70a94575693b0ad2d4e96 (patch) | |
tree | 6527d5a641f3cea6e8b15e98e63d0109b27a5531 | |
parent | 702fe45bcd08c32f7abad7522abc7a3294381d6e (diff) | |
download | bcm5719-llvm-5b7c98e52aad91e3fca70a94575693b0ad2d4e96.tar.gz bcm5719-llvm-5b7c98e52aad91e3fca70a94575693b0ad2d4e96.zip |
Last commit included some extra constexpr; remove them
llvm-svn: 303862
-rw-r--r-- | libcxx/include/algorithm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index a3bde9fa05f..7ea4474a1bb 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1760,7 +1760,7 @@ __unwrap_iter(_Iter __i) } template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 +inline _LIBCPP_INLINE_VISIBILITY typename enable_if < is_trivially_copy_assignable<_Tp>::value, @@ -1774,7 +1774,7 @@ __unwrap_iter(move_iterator<_Tp*> __i) #if _LIBCPP_DEBUG_LEVEL < 2 template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 +inline _LIBCPP_INLINE_VISIBILITY typename enable_if < is_trivially_copy_assignable<_Tp>::value, @@ -1788,7 +1788,7 @@ __unwrap_iter(__wrap_iter<_Tp*> __i) #else template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 +inline _LIBCPP_INLINE_VISIBILITY typename enable_if < is_trivially_copy_assignable<_Tp>::value, |