diff options
author | Nikolas Klauser <nikolasklauser@berlin.de> | 2024-11-13 11:57:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-13 11:57:16 +0100 |
commit | b69ddbc62838f23ace237c206676b1ed1c882638 (patch) | |
tree | c61faf36c7d5022310899fe6bfe40b1f0460a046 /libcxx/src/chrono.cpp | |
parent | 889b3c9487d114b9d082e9552599c8a8a8ccc660 (diff) | |
download | llvm-b69ddbc62838f23ace237c206676b1ed1c882638.zip llvm-b69ddbc62838f23ace237c206676b1ed1c882638.tar.gz llvm-b69ddbc62838f23ace237c206676b1ed1c882638.tar.bz2 |
[libc++] Make variables in templates inline (#115785)
The variables are all `constexpr`, which implies `inline`. Since they
aren't `constexpr` in C++03 they're also not `inline` there. Because of
that we define them out-of-line currently. Instead we can use the C++17
extension of `inline` variables, which results in the same weak
definitions of the variables but without having all the boilerplate.
Diffstat (limited to 'libcxx/src/chrono.cpp')
-rw-r--r-- | libcxx/src/chrono.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp index f17ea55..098b6a1 100644 --- a/libcxx/src/chrono.cpp +++ b/libcxx/src/chrono.cpp @@ -134,7 +134,10 @@ static system_clock::time_point __libcpp_system_clock_now() { #endif +_LIBCPP_DIAGNOSTIC_PUSH +_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated") const bool system_clock::is_steady; +_LIBCPP_DIAGNOSTIC_POP system_clock::time_point system_clock::now() noexcept { return __libcpp_system_clock_now(); } @@ -226,7 +229,10 @@ static steady_clock::time_point __libcpp_steady_clock_now() { # error "Monotonic clock not implemented on this platform" # endif +_LIBCPP_DIAGNOSTIC_PUSH +_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated") const bool steady_clock::is_steady; +_LIBCPP_DIAGNOSTIC_POP steady_clock::time_point steady_clock::now() noexcept { return __libcpp_steady_clock_now(); } |