X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=89196f3fb3be765fd000b1a18ace026a16054f47;hb=9350076b3aa268919a4bf6e05c4a10caebabb913;hp=92ed4a7eb3e273beb4ca44a888400e08c205be59;hpb=b3b22b0c70717d0f44dcb91f559ddc0c3239d30c;p=features.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 92ed4a7eb3..89196f3fb3 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -75,7 +75,13 @@ Changer MetricsBase::changeFontSet(string const & name)
 	    && ((isTextFont(oldname) && oldcolor != Color_foreground)
 	        || (isMathFont(oldname) && oldcolor != Color_math)))
 		font.setColor(oldcolor);
+#if __cplusplus >= 201402L
 	return rc;
+#else
+	/** In theory, this is not needed with C++11, and modern compilers
+	 * will complain in C++11 mode, but gcc 4.9 requires this. */
+	return std::move(rc);
+#endif
 }