Merge pull request #522 from pandamicro/v1.4

Fix compilation issues on win32
This commit is contained in:
pandamicro
2017-01-24 15:27:31 +08:00
committed by GitHub
+1 -1
View File
@@ -1041,7 +1041,7 @@ std::vector<std::string> FileUtils::listFiles(const std::string& dirPath) const
unsigned int length = MultiByteToWideChar(CP_UTF8, 0, &fullpath[0], (int)fullpath.size(), NULL, 0);
if (length != fullpath.size())
{
return;
return files;
}
std::wstring fullpathstr(length, 0);
MultiByteToWideChar(CP_UTF8, 0, &fullpath[0], (int)fullpath.size(), &fullpathstr[0], length);