mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-01-29 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowing warning (#1105) and clang format

Browse Source
This commit is contained in:
Victor Zverovich 2019-04-08 19:14:32 -07:00
parent aeb5ad3ce1
commit 718f60accb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/fmt/format.h
View File

@ -753,7 +753,8 @@ template <typename T = void> struct FMT_API basic_data {
extern template struct basic_data<void>; extern template struct basic_data<void>;
#endif #endif
typedef basic_data<> data; // This is a struct rather than a typedef to avoid shadowing warnings in gcc.
struct data : basic_data<> {};
#ifdef FMT_BUILTIN_CLZLL #ifdef FMT_BUILTIN_CLZLL
// Returns the number of decimal digits in n. Leading zeros are not counted // Returns the number of decimal digits in n. Leading zeros are not counted
@ -2621,7 +2622,9 @@ template <typename Range> class basic_writer {
num_writer{abs_value, size, sep}); num_writer{abs_value, size, sep});
} }
FMT_NORETURN void on_error() { FMT_THROW(format_error("invalid type specifier")); } FMT_NORETURN void on_error() {
FMT_THROW(format_error("invalid type specifier"));
}
}; };
// Writes a formatted integer. // Writes a formatted integer.
@ -2858,7 +2861,9 @@ struct float_spec_handler {
if (type == 'A') upper = true; if (type == 'A') upper = true;
} }
FMT_NORETURN void on_error() { FMT_THROW(format_error("invalid type specifier")); } FMT_NORETURN void on_error() {
FMT_THROW(format_error("invalid type specifier"));
}
}; };
template <typename Range> template <typename Range>