fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-08-02 20:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with MSVC.

Browse Source
This commit is contained in:
Victor Zverovich
2012-12-12 10:11:40 -08:00
parent f4f35cd1af
commit a2a8741348
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
format.cc
View File

@@ -196,7 +196,10 @@ void fmt::Formatter::FormatDouble(
case 0: case 0:
type = 'g'; type = 'g';
break; break;
case 'e': case 'E': case 'f': case 'F': case 'g': case 'G': case 'e': case 'E': case 'f': case 'g': case 'G':
break;
case 'F':
type = 'f';
break; break;
default: default:
ReportUnknownType(type, "double"); ReportUnknownType(type, "double");

13
format_test.cc
View File

@@ -480,8 +480,11 @@ TEST(FormatterTest, FormatDouble) {
EXPECT_EQ("392.65", str(Format("{0:G}") << 392.65)); EXPECT_EQ("392.65", str(Format("{0:G}") << 392.65));
EXPECT_EQ("392.650000", str(Format("{0:f}") << 392.65)); EXPECT_EQ("392.650000", str(Format("{0:f}") << 392.65));
EXPECT_EQ("392.650000", str(Format("{0:F}") << 392.65)); EXPECT_EQ("392.650000", str(Format("{0:F}") << 392.65));
EXPECT_EQ("3.926500e+02", str(Format("{0:e}") << 392.65)); char buffer[256];
EXPECT_EQ("3.926500E+02", str(Format("{0:E}") << 392.65)); sprintf(buffer, "%e", 392.65);
EXPECT_EQ(buffer, str(Format("{0:e}") << 392.65));
sprintf(buffer, "%E", 392.65);
EXPECT_EQ(buffer, str(Format("{0:E}") << 392.65));
EXPECT_EQ("+0000392.6", str(Format("{0:+010.4g}") << 392.65)); EXPECT_EQ("+0000392.6", str(Format("{0:+010.4g}") << 392.65));
} }
@@ -493,8 +496,10 @@ TEST(FormatterTest, FormatLongDouble) {
EXPECT_EQ("392.65", str(Format("{0:G}") << 392.65l)); EXPECT_EQ("392.65", str(Format("{0:G}") << 392.65l));
EXPECT_EQ("392.650000", str(Format("{0:f}") << 392.65l)); EXPECT_EQ("392.650000", str(Format("{0:f}") << 392.65l));
EXPECT_EQ("392.650000", str(Format("{0:F}") << 392.65l)); EXPECT_EQ("392.650000", str(Format("{0:F}") << 392.65l));
EXPECT_EQ("3.926500e+02", str(Format("{0:e}") << 392.65l)); char buffer[256];
EXPECT_EQ("3.926500E+02", str(Format("{0:E}") << 392.65l)); sprintf(buffer, "%Le", 392.65);
EXPECT_EQ(buffer, str(Format("{0:e}") << 392.65));
sprintf(buffer, "%LE", 392.65);
EXPECT_EQ("+0000392.6", str(Format("{0:+010.4g}") << 392.65l)); EXPECT_EQ("+0000392.6", str(Format("{0:+010.4g}") << 392.65l));
} }