diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-12-10 00:43:37 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-12-10 00:43:37 +0000 |
| commit | 6a8678edeee29fd802eb076ceeed9321a4e9f60b (patch) | |
| tree | 2f96e7d73c983e2d340f6c88302b838f6ac108e7 | |
| parent | 5c64ddfa8811be15356b196f1ed09dfc1794e8d0 (diff) | |
| download | bcm5719-llvm-6a8678edeee29fd802eb076ceeed9321a4e9f60b.tar.gz bcm5719-llvm-6a8678edeee29fd802eb076ceeed9321a4e9f60b.zip | |
Remove redundant _LIBCPP_ALWAYS_INLINE attribute from __convert_to_integral overloads
llvm-svn: 255185
| -rw-r--r-- | libcxx/include/type_traits | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 0bd4fd3a96e..e29167f0e47 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -4257,34 +4257,34 @@ struct __sfinae_underlying_type template <class _Tp> struct __sfinae_underlying_type<_Tp, false> {}; -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY int __convert_to_integral(int __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY unsigned __convert_to_integral(unsigned __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY long __convert_to_integral(long __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY unsigned long __convert_to_integral(unsigned long __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY long long __convert_to_integral(long long __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY unsigned long long __convert_to_integral(unsigned long long __val) {return __val; } #ifndef _LIBCPP_HAS_NO_INT128 -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY __int128_t __convert_to_integral(__int128_t __val) { return __val; } -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY __uint128_t __convert_to_integral(__uint128_t __val) { return __val; } #endif template <class _Tp> -inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE +inline _LIBCPP_INLINE_VISIBILITY typename __sfinae_underlying_type<_Tp>::__promoted_type __convert_to_integral(_Tp __val) { return __val; } |
