External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ranges-test from tests

Browse Source
This commit is contained in:
Elias Kosunen 2018-05-17 08:30:27 +03:00
parent ed839c4a9b
commit a8976bd3e9
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fmt/ostream.h
View File

@ -141,6 +141,7 @@ template <typename... Args>
inline void print(std::ostream &os, string_view format_str, inline void print(std::ostream &os, string_view format_str,
const Args & ... args) { const Args & ... args) {
#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440 #if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440
// Fix gcc's bugged template deduction
vprint<char>(os, format_str, make_format_args<format_context>(args...)); vprint<char>(os, format_str, make_format_args<format_context>(args...));
#else #else
vprint(os, format_str, make_format_args<format_context>(args...)); vprint(os, format_str, make_format_args<format_context>(args...));

1
include/fmt/printf.h
View File

@ -626,6 +626,7 @@ inline int fprintf(std::FILE *f, string_view format_str, const Args & ... args)
auto vargs = make_format_args< auto vargs = make_format_args<
typename printf_context<internal::buffer>::type>(args...); typename printf_context<internal::buffer>::type>(args...);
#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440 #if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440
// Fix gcc's bugged template deduction
return vfprintf<char>(f, format_str, vargs); return vfprintf<char>(f, format_str, vargs);
#else #else
return vfprintf(f, format_str, vargs); return vfprintf(f, format_str, vargs);

4
test/CMakeLists.txt
View File

@ -92,7 +92,7 @@ add_fmt_test(printf-test)
add_fmt_test(time-test) add_fmt_test(time-test)
add_fmt_test(util-test mock-allocator.h) add_fmt_test(util-test mock-allocator.h)
add_fmt_test(custom-formatter-test) 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 # Enable stricter options for one test to make sure that the header is free of
# warnings. # warnings.
@ -148,7 +148,7 @@ if (FMT_PEDANTIC)
"${CMAKE_CURRENT_BINARY_DIR}/compile-test" "${CMAKE_CURRENT_BINARY_DIR}/compile-test"
--build-generator ${CMAKE_GENERATOR} --build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-options --build-options
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
"-DCPP14_FLAG=${CPP14_FLAG}" "-DCPP14_FLAG=${CPP14_FLAG}"
"-DSUPPORTS_USER_DEFINED_LITERALS=${SUPPORTS_USER_DEFINED_LITERALS}") "-DSUPPORTS_USER_DEFINED_LITERALS=${SUPPORTS_USER_DEFINED_LITERALS}")