From bb006f9735f048733dcaa149c0bb36ba4ae158fe Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Sat, 24 Apr 2021 11:35:49 -0700
Subject: [PATCH] Replace TYPED_TEST_CASE with TYPED_TEST_SUITE

---
 CMakeLists.txt    |  5 +++--
 test/core-test.cc | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42279acf..b2985a7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
       -Wconversion -Wswitch-enum -Wundef
       -Wno-ctor-dtor-privacy -Wno-format-nonliteral)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
-      set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wnoexcept
+      set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS}
          -Wno-dangling-else -Wno-unused-local-typedefs)
   endif ()
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
@@ -132,7 +132,8 @@ endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -pedantic -Wconversion -Wundef
-      -Wdeprecated -Wweak-vtables -Wshadow)
+      -Wdeprecated -Wweak-vtables -Wshadow
+      -Wno-gnu-zero-variadic-macro-arguments)
   check_cxx_compiler_flag(-Wzero-as-null-pointer-constant HAS_NULLPTR_WARNING)
   if (HAS_NULLPTR_WARNING)
     set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS}
diff --git a/test/core-test.cc b/test/core-test.cc
index d3fdf536..3c2ab68c 100644
--- a/test/core-test.cc
+++ b/test/core-test.cc
@@ -330,10 +330,10 @@ VISIT_TYPE(unsigned long, unsigned long long);
 template <typename T> class numeric_arg_test : public testing::Test {};
 
 using types =
-    ::testing::Types<bool, signed char, unsigned char, short, unsigned short,
-                     int, unsigned, long, unsigned long, long long,
-                     unsigned long long, float, double, long double>;
-TYPED_TEST_CASE(numeric_arg_test, types);
+    testing::Types<bool, signed char, unsigned char, short, unsigned short, int,
+                   unsigned, long, unsigned long, long long, unsigned long long,
+                   float, double, long double>;
+TYPED_TEST_SUITE(numeric_arg_test, types);
 
 template <typename T, fmt::enable_if_t<std::is_integral<T>::value, int> = 0>
 T test_value() {
@@ -510,8 +510,8 @@ struct non_string {};
 
 template <typename T> class IsStringTest : public testing::Test {};
 
-typedef ::testing::Types<char, wchar_t, char16_t, char32_t> StringCharTypes;
-TYPED_TEST_CASE(IsStringTest, StringCharTypes);
+typedef testing::Types<char, wchar_t, char16_t, char32_t> StringCharTypes;
+TYPED_TEST_SUITE(IsStringTest, StringCharTypes);
 
 namespace {
 template <typename Char>