From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 8 Oct 2012 19:26:17 +0000 (+0200)
Subject: Do not rely on make_pair converting string to FileName
X-Git-Tag: 2.1.0beta1~1438
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3bc9cbcdc8107503e48a685dd59ac177b1f28886;p=features.git

Do not rely on make_pair converting string to FileName

This fixes compilation with MSVC2012.
---

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 1b7e43d974..9962af6039 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -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)) {