Fix warnings.

This commit is contained in:
Victor Zverovich 2014-05-06 11:29:07 -07:00
parent aab84f67a4
commit 44b57bdf8b
2 changed files with 2 additions and 3 deletions

View File

@ -1698,7 +1698,7 @@ TEST(FormatterTest, FileSinkWriteError) {
File::pipe(read_end, write_end);
BufferedFile f = read_end.fdopen("r");
fmt::FileSink fs(f.get());
int result = std::fwrite(" ", 1, 1, f.get());
std::size_t result = std::fwrite(" ", 1, 1, f.get());
int error_code = errno;
EXPECT_EQ(0, result);
EXPECT_SYSTEM_ERROR(
@ -1859,7 +1859,6 @@ TEST(FormatTest, PrintColored) {
TEST(FormatTest, Variadic) {
EXPECT_EQ("abc1", str(Format("{}c{}", "ab", 1)));
EXPECT_EQ(L"abc1", str(Format(L"{}c{}", L"ab", 1)));
EXPECT_WRITE(stdout, fmt::Print("So {}!", "variadic"), "So variadic!");
}
#endif // FMT_USE_VARIADIC_TEMPLATES

View File

@ -58,7 +58,7 @@ namespace {
// On Windows the count argument to read and write is unsigned, so convert
// it from size_t preventing integer overflow.
inline unsigned ConvertRWCount(std::size_t count) {
return count <= UINT_MAX ? count : UINT_MAX;
return count <= UINT_MAX ? static_cast<unsigned>(count) : UINT_MAX;
}
#else
inline std::size_t ConvertRWCount(std::size_t count) { return count; }