fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-26 20:30:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix check_format_string (#925)

Browse Source
This commit is contained in:
Victor Zverovich
2018-11-03 16:20:45 -07:00
parent 36161284e2
commit a23d592472
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/fmt/format.h
View File

@@ -2243,7 +2243,7 @@ class format_string_checker {
};
template <typename Char, typename ErrorHandler, typename... Args>
FMT_CONSTEXPR bool check_format_string(
FMT_CONSTEXPR bool do_check_format_string(
basic_string_view<Char> s, ErrorHandler eh = ErrorHandler()) {
format_string_checker<Char, ErrorHandler, Args...> checker(s, eh);
parse_format_string<true>(s, checker);
@@ -2254,7 +2254,7 @@ template <typename... Args, typename S>
typename std::enable_if<is_compile_string<S>::value>::type
check_format_string(S format_str) {
typedef typename S::char_type char_t;
FMT_CONSTEXPR_DECL bool invalid_format = internal::check_format_string<
FMT_CONSTEXPR_DECL bool invalid_format = internal::do_check_format_string<
char_t, internal::error_handler, Args...>(to_string_view(format_str));
(void)invalid_format;
}
@@ -3583,7 +3583,7 @@ class udl_formatter {
std::basic_string<Char> operator()(const Args &... args) const {
FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'};
FMT_CONSTEXPR_DECL bool invalid_format =
check_format_string<Char, error_handler, Args...>(
do_check_format_string<Char, error_handler, Args...>(
basic_string_view<Char>(s, sizeof...(CHARS)));
(void)invalid_format;
return format(s, args...);