[LyX/master] Revert "Do not return copies of string members"

Jean-Marc Lasgouttes lasgouttes at lyx.org
Mon May 15 14:06:57 UTC 2023


commit e0db6378c97b42607fa8db5e169d0976d26374ff
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Thu May 11 15:27:02 2023 +0200

    Revert "Do not return copies of string members"
    
    This commit is very wrong when trivstrings are used (since what is
    retirned is a temporary variable) and it turns out that cygwin
    requires this for some reason.
    
    This reverts commit 3ae5d6bdec1df23cc0d848b2d8bf6b0932eeee3b.
---
 src/Converter.h |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Converter.h b/src/Converter.h
index 9e8249d..091dbcd 100644
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -52,15 +52,15 @@ public:
 	///
 	void readFlags();
 	///
-	std::string const & from() const { return from_; }
+	std::string const from() const { return from_; }
 	///
-	std::string const & to() const { return to_; }
+	std::string const to() const { return to_; }
 	///
-	std::string const & command() const { return command_; }
+	std::string const command() const { return command_; }
 	///
 	void setCommand(std::string const & command);
 	///
-	std::string const & flags() const { return flags_; }
+	std::string const flags() const { return flags_; }
 	///
 	void setFlags(std::string const & flags) { flags_ = flags; }
 	///
@@ -74,7 +74,7 @@ public:
 	///
 	bool latex() const { return latex_; }
 	///
-	std::string const & latex_flavor() const { return latex_flavor_; }
+	std::string const latex_flavor() const { return latex_flavor_; }
 	///
 	bool docbook() const { return docbook_; }
 	///
@@ -84,13 +84,13 @@ public:
 	///
 	bool nice() const { return nice_; }
 	///
-	std::string const & result_dir() const { return result_dir_; }
+	std::string const result_dir() const { return result_dir_; }
 	///
-	std::string const & result_file() const { return result_file_; }
+	std::string const result_file() const { return result_file_; }
 	///
-	std::string const & parselog() const { return parselog_; }
+	std::string const parselog() const { return parselog_; }
 	///
-	std::string const & hyperref_driver() const { return href_driver_; }
+	std::string const hyperref_driver() const { return href_driver_; }
 
 private:
 	///


More information about the lyx-cvs mailing list