From 3ee24b2306f6e6d18a3ab97dc0b7961cb9b12a75 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon, 7 Dec 2020 10:35:57 +0100
Subject: [PATCH] Simplify clang workarounds.

---
 tpool/tpool_generic.cc | 11 ++---------
 1 file 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 */