From a13e0ddedfb520f472d0b3ec6471cdf7eef99354 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 8 Jan 2011 21:58:48 +0000 Subject: [PATCH] Clear out some warnings emitted by Visual C++ 2010. On 32 bit VC 2010, std::streamsize is 64 bit while size_t is 32 bit. Originally committed to SVN as r5151. --- aegisub/libaegisub/common/charset_ucd.cpp | 6 +++--- aegisub/libaegisub/common/log.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/libaegisub/common/charset_ucd.cpp b/aegisub/libaegisub/common/charset_ucd.cpp index 70832b8cd..77ad6fc2f 100644 --- a/aegisub/libaegisub/common/charset_ucd.cpp +++ b/aegisub/libaegisub/common/charset_ucd.cpp @@ -39,7 +39,7 @@ UCDetect::UCDetect(const std::string &file): nsUniversalDetector(NS_FILTER_ALL) while (!mDone && !fp->eof()) { char buf[512]; fp->read(buf, 512); - size_t bytes = fp->gcount(); + size_t bytes = (size_t)fp->gcount(); HandleData(buf, bytes); } } @@ -47,7 +47,7 @@ UCDetect::UCDetect(const std::string &file): nsUniversalDetector(NS_FILTER_ALL) DataEnd(); if (mDetectedCharset) { - list.insert(CLDPair(1, mDetectedCharset)); + list.insert(CLDPair(1.f, mDetectedCharset)); } else { switch (mInputState) { @@ -64,7 +64,7 @@ UCDetect::UCDetect(const std::string &file): nsUniversalDetector(NS_FILTER_ALL) break; } case ePureAscii: - list.insert(CLDPair(1, "US-ASCII")); + list.insert(CLDPair(1.f, "US-ASCII")); break; default: diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp index 968eab747..02231fef9 100644 --- a/aegisub/libaegisub/common/log.cpp +++ b/aegisub/libaegisub/common/log.cpp @@ -148,7 +148,7 @@ Message::Message(const char *section, Message::~Message() { sm->message = msg.str(); - sm->len = msg.pcount(); + sm->len = (size_t)msg.pcount(); agi::log::log->log(sm); }