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

This reverts commit 1834a310d060d55748ca38d4ae0482864c2047d8.

1 files changed, 20 insertions, 13 deletions

diff --git a/llvm/unittests/ADT/StringRefTest.cpp b/llvm/unittests/ADT/StringRefTest.cpp
index 4ea1ea54..3827ebe 100644
--- a/llvm/unittests/ADT/StringRefTest.cpp
+++ b/llvm/unittests/ADT/StringRefTest.cpp
@@ -34,18 +34,24 @@ std::ostream &operator<<(std::ostream &OS,
 // Check that we can't accidentally assign a temporary std::string to a
 // StringRef. (Unfortunately we can't make use of the same thing with
 // constructors.)
-static_assert(!std::is_assignable_v<StringRef &, std::string>,
-              "Assigning from prvalue std::string");
-static_assert(!std::is_assignable_v<StringRef &, std::string &&>,
-              "Assigning from xvalue std::string");
-static_assert(std::is_assignable_v<StringRef &, std::string &>,
-              "Assigning from lvalue std::string");
-static_assert(std::is_assignable_v<StringRef &, const char *>,
-              "Assigning from prvalue C string");
-static_assert(std::is_assignable_v<StringRef &, const char *&&>,
-              "Assigning from xvalue C string");
-static_assert(std::is_assignable_v<StringRef &, const char *&>,
-              "Assigning from lvalue C string");
+static_assert(
+    !std::is_assignable<StringRef&, std::string>::value,
+    "Assigning from prvalue std::string");
+static_assert(
+    !std::is_assignable<StringRef&, std::string &&>::value,
+    "Assigning from xvalue std::string");
+static_assert(
+    std::is_assignable<StringRef&, std::string &>::value,
+    "Assigning from lvalue std::string");
+static_assert(
+    std::is_assignable<StringRef&, const char *>::value,
+    "Assigning from prvalue C string");
+static_assert(
+    std::is_assignable<StringRef&, const char * &&>::value,
+    "Assigning from xvalue C string");
+static_assert(
+    std::is_assignable<StringRef&, const char * &>::value,
+    "Assigning from lvalue C string");
 
 namespace {
 TEST(StringRefTest, Construction) {
@@ -1138,6 +1144,7 @@ TEST(StringRefTest, LFCRLineEnding) {
   EXPECT_EQ(StringRef("\n\r"), Cases[2].detectEOL());
 }
 
-static_assert(std::is_trivially_copyable_v<StringRef>, "trivially copyable");
+static_assert(std::is_trivially_copyable<StringRef>::value,
+              "trivially copyable");
 
 } // end anonymous namespace