mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-24 12:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of unpacked args (#437)

Browse Source
This commit is contained in:
Victor Zverovich 2016-12-23 08:24:48 -08:00
parent 1183621867
commit f05888692c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fmt/format.h
View File

@ -1538,7 +1538,7 @@ template <typename Context, typename ...Args>
class format_arg_store {
private:
static const size_t NUM_ARGS = sizeof...(Args);
static const bool IS_PACKED = NUM_ARGS <= internal::MAX_PACKED_ARGS;
static const bool IS_PACKED = NUM_ARGS < internal::MAX_PACKED_ARGS;
typedef typename Context::char_type char_type;
@ -1552,7 +1552,7 @@ class format_arg_store {
static const uint64_t TYPES = internal::make_type<Args..., void>();
format_arg_store(const Args &... args)
: data_{{internal::MakeValue<Context>(args)...}} {}
: data_{{internal::MakeArg<Context>(args)...}} {}
const value_type *data() const { return data_.data(); }
};

9
test/format-test.cc
View File

@ -1577,10 +1577,11 @@ void print_error(const char *file, int line, const char *format,
}
#endif
TEST(FormatTest, MaxArgs) {
EXPECT_EQ("0123456789abcde",
fmt::format("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e'));
TEST(FormatTest, UnpackedArgs) {
EXPECT_EQ("0123456789abcdefg",
fmt::format("{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e',
'f', 'g'));
}
#if FMT_USE_USER_DEFINED_LITERALS