diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-12-07 10:35:57 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-12-07 10:35:57 +0100 |
| commit | 3ee24b2306f6e6d18a3ab97dc0b7961cb9b12a75 (patch) | |
| tree | 02010f499569cec10e4b52750cdce9c49d4c088e | |
| parent | 83591a23d6c2a09d9c24cccbc7d6e20a6feffe86 (diff) | |
| download | mariadb-git-3ee24b2306f6e6d18a3ab97dc0b7961cb9b12a75.tar.gz | |
Simplify clang workarounds.
| -rw-r--r-- | tpool/tpool_generic.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tpool/tpool_generic.cc b/tpool/tpool_generic.cc index abc593be02c..7c645b09785 100644 --- a/tpool/tpool_generic.cc +++ b/tpool/tpool_generic.cc @@ -561,15 +561,8 @@ void thread_pool_generic::worker_main(worker_data *thread_var) Helper function, to be used inside maintenance callback, before m_last_activity is updated */ -#ifndef __has_feature -# define __has_feature(x) 0 -#endif -#if __has_feature(memory_sanitizer) -const /* WITH_MSAN in clang++-11 does not work with constexpr */ -#else -constexpr -#endif -auto invalid_timestamp= std::chrono::system_clock::time_point::max(); + +static const auto invalid_timestamp= std::chrono::system_clock::time_point::max(); constexpr auto max_idle_time= std::chrono::minutes(1); /* Time since maintenance timer had nothing to do */ |