Do not rely on make_pair converting string to FileName

This fixes compilation with MSVC2012.
This commit is contained in:
Vincent van Ravesteijn 2012-10-08 21:26:17 +02:00
parent 53694874f3
commit 3bc9cbcdc8

View File

@ -487,7 +487,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
string const file_in = file.absFileName();
string const only_path = onlyPath(file_in);
if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
return make_pair(IDENTICAL_PATHS, file_in);
return make_pair(IDENTICAL_PATHS, FileName(file_in));
string mangled = file.mangledFileName();
if (formats.isZippedFile(file)) {