AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-13 22:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix msvc warnings

Browse Source
This commit is contained in:
Victor Zverovich 2018-04-04 21:11:31 -07:00
parent 1e747f603f
commit 5859e58ba1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/format.h
View File

@ -1804,9 +1804,9 @@ struct arg_ref {
FMT_CONSTEXPR explicit arg_ref(unsigned index) : kind(INDEX), index(index) {}
explicit arg_ref(basic_string_view<Char> name) : kind(NAME), name(name) {}
FMT_CONSTEXPR arg_ref &operator=(unsigned index) {
FMT_CONSTEXPR arg_ref &operator=(unsigned idx) {
kind = INDEX;
this->index = index;
index = idx;
return *this;
}

16
test/format-test.cc
View File

@ -1565,7 +1565,7 @@ struct test_format_specs_handler {
enum Result { NONE, PLUS, MINUS, SPACE, HASH, ZERO, ERROR };
Result res = NONE;
fmt::alignment align = fmt::ALIGN_DEFAULT;
fmt::alignment align_ = fmt::ALIGN_DEFAULT;
char fill = 0;
unsigned width = 0;
fmt::internal::arg_ref<char> width_ref;
@ -1577,12 +1577,12 @@ struct test_format_specs_handler {
// to a constant" with compiler-generated copy ctor.
FMT_CONSTEXPR test_format_specs_handler() {}
FMT_CONSTEXPR test_format_specs_handler(const test_format_specs_handler &other)
: res(other.res), align(other.align), fill(other.fill),
: res(other.res), align_(other.align_), fill(other.fill),
width(other.width), width_ref(other.width_ref),
precision(other.precision), precision_ref(other.precision_ref),
type(other.type) {}
FMT_CONSTEXPR void on_align(fmt::alignment a) { align = a; }
FMT_CONSTEXPR void on_align(fmt::alignment a) { align_ = a; }
FMT_CONSTEXPR void on_fill(char f) { fill = f; }
FMT_CONSTEXPR void on_plus() { res = PLUS; }
FMT_CONSTEXPR void on_minus() { res = MINUS; }
@ -1597,11 +1597,13 @@ struct test_format_specs_handler {
FMT_CONSTEXPR void on_precision(unsigned p) { precision = p; }
FMT_CONSTEXPR void on_dynamic_precision(fmt::internal::auto_id) {}
FMT_CONSTEXPR void on_dynamic_precision(unsigned index) { precision_ref = index; }
FMT_CONSTEXPR void on_dynamic_precision(unsigned index) {
precision_ref = index;
}
FMT_CONSTEXPR void on_dynamic_precision(string_view) {}
FMT_CONSTEXPR void end_precision() {}
FMT_CONSTEXPR void on_type(char type) { this->type = type; }
FMT_CONSTEXPR void on_type(char t) { type = t; }
FMT_CONSTEXPR void on_error(const char *) { res = ERROR; }
};
@ -1613,7 +1615,7 @@ FMT_CONSTEXPR test_format_specs_handler parse_test_specs(const char *s) {
TEST(FormatTest, ConstexprParseFormatSpecs) {
typedef test_format_specs_handler handler;
static_assert(parse_test_specs("<").align == fmt::ALIGN_LEFT, "");
static_assert(parse_test_specs("<").align_ == fmt::ALIGN_LEFT, "");
static_assert(parse_test_specs("*^").fill == '*', "");
static_assert(parse_test_specs("+").res == handler::PLUS, "");
static_assert(parse_test_specs("-").res == handler::MINUS, "");
@ -1711,7 +1713,7 @@ FMT_CONSTEXPR test_format_specs_handler check_specs(const char *s) {
TEST(FormatTest, ConstexprSpecsChecker) {
typedef test_format_specs_handler handler;
static_assert(check_specs("<").align == fmt::ALIGN_LEFT, "");
static_assert(check_specs("<").align_ == fmt::ALIGN_LEFT, "");
static_assert(check_specs("*^").fill == '*', "");
static_assert(check_specs("+").res == handler::PLUS, "");
static_assert(check_specs("-").res == handler::MINUS, "");