Remove FMT_USE_VARIADIC_TEMPLATES

This commit is contained in:
Victor Zverovich 2017-11-11 06:49:03 -08:00
parent dba1ccc4d7
commit e805543341
2 changed files with 1 additions and 6 deletions

View File

@ -83,7 +83,6 @@ def build_docs(version='dev', **kwargs):
ALIASES += "endrst=\endverbatim"
MACRO_EXPANSION = YES
PREDEFINED = _WIN32=1 \
FMT_USE_VARIADIC_TEMPLATES=1 \
FMT_USE_RVALUE_REFERENCES=1 \
FMT_USE_USER_DEFINED_LITERALS=1 \
FMT_API=

View File

@ -455,7 +455,6 @@ TEST(FormatterTest, ArgErrors) {
EXPECT_THROW_MSG(format(format_str), format_error, "number is too big");
}
#if FMT_USE_VARIADIC_TEMPLATES
template <int N>
struct TestFormat {
template <typename... Args>
@ -478,12 +477,11 @@ TEST(FormatterTest, ManyArgs) {
format_error, "argument index out of range");
EXPECT_THROW_MSG(TestFormat<21>::format("{21}"),
format_error, "argument index out of range");
enum { MAX_PACKED_ARGS = fmt::ArgList::MAX_PACKED_ARGS };
enum { MAX_PACKED_ARGS = fmt::internal::MAX_PACKED_ARGS };
std::string format_str = fmt::format("{{{}}}", MAX_PACKED_ARGS + 1);
EXPECT_THROW_MSG(TestFormat<MAX_PACKED_ARGS>::format(format_str),
format_error, "argument index out of range");
}
#endif
TEST(FormatterTest, NamedArg) {
EXPECT_EQ("1/a/A", format("{_1}/{a_}/{A_}", fmt::arg("a_", 'a'),
@ -1451,14 +1449,12 @@ TEST(FormatTest, FormatMessageExample) {
format_message(42, "{} happened", "something"));
}
#if FMT_USE_VARIADIC_TEMPLATES
template<typename... Args>
void print_error(const char *file, int line, const char *format,
const Args & ... args) {
fmt::print("{}: {}: ", file, line);
fmt::print(format, args...);
}
#endif
TEST(FormatTest, UnpackedArgs) {
EXPECT_EQ("0123456789abcdefg",