External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace return type with auto to hopefully fix vs2013 compile error

Browse Source 
remove some whitespace
This commit is contained in:
Thomas Novotny 2018-11-21 19:06:53 +01:00
parent 724e3eafd4
commit 2058098a1c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/printf-test.cc
View File

@ -502,7 +502,7 @@ TEST(PrintfTest, OStream) {
TEST(PrintfTest, VPrintf) { TEST(PrintfTest, VPrintf) {
fmt::format_arg_store<fmt::printf_context, int> as{42}; fmt::format_arg_store<fmt::printf_context, int> as{42};
fmt::basic_format_args<fmt::printf_context> args( as ); fmt::basic_format_args<fmt::printf_context> args(as);
EXPECT_EQ(fmt::vsprintf("%d", args), "42"); EXPECT_EQ(fmt::vsprintf("%d", args), "42");
EXPECT_WRITE(stdout, fmt::vprintf("%d", args), "42"); EXPECT_WRITE(stdout, fmt::vprintf("%d", args), "42");
EXPECT_WRITE(stdout, fmt::vfprintf(stdout, "%d", args), "42"); EXPECT_WRITE(stdout, fmt::vfprintf(stdout, "%d", args), "42");
@ -518,18 +518,17 @@ TEST(PrintfTest, CheckFormatStringRegression) {
check_format_string_regression("%c%s", 'x', ""); check_format_string_regression("%c%s", 'x', "");
} }
TEST( PrintfTest, VSPrintfMakeArgsExample ) { TEST(PrintfTest, VSPrintfMakeArgsExample) {
fmt::format_arg_store<fmt::printf_context, int, const char *> as{42, fmt::format_arg_store<fmt::printf_context, int, const char *> as{42,
"something"}; "something"};
fmt::basic_format_args<fmt::printf_context> args(as); fmt::basic_format_args<fmt::printf_context> args(as);
EXPECT_EQ( EXPECT_EQ(
"[42] something happened", fmt::vsprintf("[%d] %s happened", args)); "[42] something happened", fmt::vsprintf("[%d] %s happened", args));
fmt::format_arg_store<fmt::printf_context, int, char[10]> as2 = auto as2 = fmt::make_printf_args(42, "something");
fmt::make_printf_args(42, "something");
fmt::basic_format_args<fmt::printf_context> args2(as2); fmt::basic_format_args<fmt::printf_context> args2(as2);
EXPECT_EQ( EXPECT_EQ(
"[42] something happened", fmt::vsprintf("[%d] %s happened", args2)); "[42] something happened", fmt::vsprintf("[%d] %s happened", args2));
//the older gcc versions can"t cast the return value //the older gcc versions can't cast the return value
#if !defined(__GNUC__) || (__GNUC__ > 4) #if !defined(__GNUC__) || (__GNUC__ > 4)
EXPECT_EQ( EXPECT_EQ(
"[42] something happened", "[42] something happened",
@ -538,18 +537,18 @@ TEST( PrintfTest, VSPrintfMakeArgsExample ) {
#endif #endif
} }
TEST( PrintfTest, VSPrintfMakeWArgsExample ) { TEST(PrintfTest, VSPrintfMakeWArgsExample) {
fmt::format_arg_store<fmt::wprintf_context, int, const wchar_t *> as{ fmt::format_arg_store<fmt::wprintf_context, int, const wchar_t *> as{
42,L"something"}; 42,L"something"};
fmt::basic_format_args<fmt::wprintf_context> args(as); fmt::basic_format_args<fmt::wprintf_context> args(as);
EXPECT_EQ( EXPECT_EQ(
L"[42] something happened", L"[42] something happened",
fmt::vsprintf(L"[%d] %s happened", args)); fmt::vsprintf(L"[%d] %s happened", args));
fmt::format_arg_store<fmt::wprintf_context, int, wchar_t[10]> as2 = auto as2 = fmt::make_wprintf_args(42, L"something");
fmt::make_wprintf_args(42, L"something"); fmt::basic_format_args<fmt::wprintf_context> args2(as2);
fmt::basic_format_args<fmt::wprintf_context> args2( as2 );
EXPECT_EQ( EXPECT_EQ(
L"[42] something happened", fmt::vsprintf(L"[%d] %s happened", args2)); L"[42] something happened", fmt::vsprintf(L"[%d] %s happened", args2));
// the older gcc versions can't cast the return value
#if !defined(__GNUC__) || (__GNUC__ > 4) #if !defined(__GNUC__) || (__GNUC__ > 4)
EXPECT_EQ( EXPECT_EQ(
L"[42] something happened", L"[42] something happened",