Revert "[llvm][NFC] Use c++17 style variable type traits"

This reverts commit 1834a310d060d55748ca38d4ae0482864c2047d8.

1 files changed, 6 insertions, 4 deletions

diff --git a/llvm/unittests/Support/ThreadLocalTest.cpp b/llvm/unittests/Support/ThreadLocalTest.cpp
index 454e4f2..075d7d9 100644
--- a/llvm/unittests/Support/ThreadLocalTest.cpp
+++ b/llvm/unittests/Support/ThreadLocalTest.cpp
@@ -25,8 +25,9 @@ struct S {
 TEST_F(ThreadLocalTest, Basics) {
   ThreadLocal<const S> x;
 
-  static_assert(std::is_const_v<std::remove_pointer_t<decltype(x.get())>>,
-                "ThreadLocal::get didn't return a pointer to const object");
+  static_assert(
+      std::is_const<std::remove_pointer<decltype(x.get())>::type>::value,
+      "ThreadLocal::get didn't return a pointer to const object");
 
   EXPECT_EQ(nullptr, x.get());
 
@@ -39,8 +40,9 @@ TEST_F(ThreadLocalTest, Basics) {
 
   ThreadLocal<S> y;
 
-  static_assert(!std::is_const_v<std::remove_pointer_t<decltype(y.get())>>,
-                "ThreadLocal::get returned a pointer to const object");
+  static_assert(
+      !std::is_const<std::remove_pointer<decltype(y.get())>::type>::value,
+      "ThreadLocal::get returned a pointer to const object");
 
   EXPECT_EQ(nullptr, y.get());