From a8976bd3e9625b5008f27d8884f7144dd26680e2 Mon Sep 17 00:00:00 2001 From: Elias Kosunen Date: Thu, 17 May 2018 08:30:27 +0300 Subject: [PATCH] Remove ranges-test from tests --- include/fmt/ostream.h | 1 + include/fmt/printf.h | 1 + test/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/fmt/ostream.h b/include/fmt/ostream.h index a836d16c..32e9a9c1 100644 --- a/include/fmt/ostream.h +++ b/include/fmt/ostream.h @@ -141,6 +141,7 @@ template inline void print(std::ostream &os, string_view format_str, const Args & ... args) { #if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440 + // Fix gcc's bugged template deduction vprint(os, format_str, make_format_args(args...)); #else vprint(os, format_str, make_format_args(args...)); diff --git a/include/fmt/printf.h b/include/fmt/printf.h index 29aef503..db1a0d73 100644 --- a/include/fmt/printf.h +++ b/include/fmt/printf.h @@ -626,6 +626,7 @@ inline int fprintf(std::FILE *f, string_view format_str, const Args & ... args) auto vargs = make_format_args< typename printf_context::type>(args...); #if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440 + // Fix gcc's bugged template deduction return vfprintf(f, format_str, vargs); #else return vfprintf(f, format_str, vargs); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 07b10a0a..785bb694 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -92,7 +92,7 @@ add_fmt_test(printf-test) add_fmt_test(time-test) add_fmt_test(util-test mock-allocator.h) add_fmt_test(custom-formatter-test) -add_fmt_test(ranges-test) +#add_fmt_test(ranges-test) # Enable stricter options for one test to make sure that the header is free of # warnings. @@ -148,7 +148,7 @@ if (FMT_PEDANTIC) "${CMAKE_CURRENT_BINARY_DIR}/compile-test" --build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-options + --build-options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCPP14_FLAG=${CPP14_FLAG}" "-DSUPPORTS_USER_DEFINED_LITERALS=${SUPPORTS_USER_DEFINED_LITERALS}")