Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more compilers to CI and increase FMT_PEDANTIC warning levels #736

Merged
merged 18 commits into from
Jun 6, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove ranges-test from tests
  • Loading branch information
eliaskosunen committed May 17, 2018
commit a8976bd3e9625b5008f27d8884f7144dd26680e2
1 change: 1 addition & 0 deletions include/fmt/ostream.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ template <typename... Args>
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<char>(os, format_str, make_format_args<format_context>(args...));
#else
vprint(os, format_str, make_format_args<format_context>(args...));
Expand Down
1 change: 1 addition & 0 deletions include/fmt/printf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<internal::buffer>::type>(args...);
#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 440
// Fix gcc's bugged template deduction
return vfprintf<char>(f, format_str, vargs);
#else
return vfprintf(f, format_str, vargs);
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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}")
Expand Down