Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Pieter van der Kloet 2011-05-10 17:10:14 +02:00
commit d4e3d36c8c

View file

@ -55,10 +55,10 @@ namespace Files
{ {
boost::filesystem::path path = *iter; boost::filesystem::path path = *iter;
if (!equal (extension, path.extension())) if (!equal (extension, boost::filesystem::path (path.extension()).string()))
continue; continue;
std::string filename = path.filename(); std::string filename = boost::filesystem::path (path.filename()).string();
TIter result = mFiles.find (filename); TIter result = mFiles.find (filename);