mirror of
https://github.com/fmtlib/fmt.git
synced 2024-11-26 04:00:05 +00:00
Replace TYPED_TEST_CASE with TYPED_TEST_SUITE
This commit is contained in:
parent
6956b10b2d
commit
bb006f9735
@ -115,7 +115,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
|||||||
-Wconversion -Wswitch-enum -Wundef
|
-Wconversion -Wswitch-enum -Wundef
|
||||||
-Wno-ctor-dtor-privacy -Wno-format-nonliteral)
|
-Wno-ctor-dtor-privacy -Wno-format-nonliteral)
|
||||||
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
|
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)
|
-Wno-dangling-else -Wno-unused-local-typedefs)
|
||||||
endif ()
|
endif ()
|
||||||
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
||||||
@ -132,7 +132,8 @@ endif ()
|
|||||||
|
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -pedantic -Wconversion -Wundef
|
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)
|
check_cxx_compiler_flag(-Wzero-as-null-pointer-constant HAS_NULLPTR_WARNING)
|
||||||
if (HAS_NULLPTR_WARNING)
|
if (HAS_NULLPTR_WARNING)
|
||||||
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS}
|
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS}
|
||||||
|
@ -330,10 +330,10 @@ VISIT_TYPE(unsigned long, unsigned long long);
|
|||||||
template <typename T> class numeric_arg_test : public testing::Test {};
|
template <typename T> class numeric_arg_test : public testing::Test {};
|
||||||
|
|
||||||
using types =
|
using types =
|
||||||
::testing::Types<bool, signed char, unsigned char, short, unsigned short,
|
testing::Types<bool, signed char, unsigned char, short, unsigned short, int,
|
||||||
int, unsigned, long, unsigned long, long long,
|
unsigned, long, unsigned long, long long, unsigned long long,
|
||||||
unsigned long long, float, double, long double>;
|
float, double, long double>;
|
||||||
TYPED_TEST_CASE(numeric_arg_test, types);
|
TYPED_TEST_SUITE(numeric_arg_test, types);
|
||||||
|
|
||||||
template <typename T, fmt::enable_if_t<std::is_integral<T>::value, int> = 0>
|
template <typename T, fmt::enable_if_t<std::is_integral<T>::value, int> = 0>
|
||||||
T test_value() {
|
T test_value() {
|
||||||
@ -510,8 +510,8 @@ struct non_string {};
|
|||||||
|
|
||||||
template <typename T> class IsStringTest : public testing::Test {};
|
template <typename T> class IsStringTest : public testing::Test {};
|
||||||
|
|
||||||
typedef ::testing::Types<char, wchar_t, char16_t, char32_t> StringCharTypes;
|
typedef testing::Types<char, wchar_t, char16_t, char32_t> StringCharTypes;
|
||||||
TYPED_TEST_CASE(IsStringTest, StringCharTypes);
|
TYPED_TEST_SUITE(IsStringTest, StringCharTypes);
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
|
Loading…
Reference in New Issue
Block a user