Merge latest msvc fixes from stable branch

This commit is contained in:
Christophe Dumez
2010-06-06 10:10:45 +00:00
parent 8ec1621334
commit 4805690dbe
6 changed files with 67 additions and 55 deletions

View File

@@ -74,7 +74,9 @@ public:
}
static inline sha1_hash QStringToSha1(const QString& s) {
std::istringstream i(s.toStdString());
std::string str(s.toLocal8Bit().data());
std::istringstream i(str);
std::cout << "lol" << std::endl;
sha1_hash x;
i>>x;
return x;