diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-07-14 18:58:48 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-02-08 19:03:59 +0000 |
| commit | 753f127f3ace09432b2baeffd71a308760641a62 (patch) | |
| tree | 97694ab339c0ca6145ebb429c7505019565b9a60 /contrib/llvm-project/libcxx/include/__mutex_base | |
| parent | 81ad626541db97eb356e2c1d4a20eb2a26a766ab (diff) | |
| parent | 1f917f69ff07f09b6dbb670971f57f8efe718b84 (diff) | |
| download | src-753f127f3ace09432b2baeffd71a308760641a62.tar.gz src-753f127f3ace09432b2baeffd71a308760641a62.zip | |
Merge llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-15-init-16436-g18a6ab5b8d1f.
PR: 265425
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/libcxx/include/__mutex_base')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/__mutex_base | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/contrib/llvm-project/libcxx/include/__mutex_base b/contrib/llvm-project/libcxx/include/__mutex_base index da056b6d1423..ac0d090b7d19 100644 --- a/contrib/llvm-project/libcxx/include/__mutex_base +++ b/contrib/llvm-project/libcxx/include/__mutex_base @@ -338,11 +338,7 @@ private: template <class _Rep, class _Period> inline _LIBCPP_INLINE_VISIBILITY -typename enable_if -< - is_floating_point<_Rep>::value, - chrono::nanoseconds ->::type +__enable_if_t<is_floating_point<_Rep>::value, chrono::nanoseconds> __safe_nanosecond_cast(chrono::duration<_Rep, _Period> __d) { using namespace chrono; @@ -365,11 +361,7 @@ __safe_nanosecond_cast(chrono::duration<_Rep, _Period> __d) template <class _Rep, class _Period> inline _LIBCPP_INLINE_VISIBILITY -typename enable_if -< - !is_floating_point<_Rep>::value, - chrono::nanoseconds ->::type +__enable_if_t<!is_floating_point<_Rep>::value, chrono::nanoseconds> __safe_nanosecond_cast(chrono::duration<_Rep, _Period> __d) { using namespace chrono; |