From 3ae5d6bdec1df23cc0d848b2d8bf6b0932eeee3b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 5 May 2023 20:35:23 +0200 Subject: [PATCH] Do not return copies of string members MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes the g++ 12 warnings below. ../../master/src/Converter.cpp:714:55: warning: possibly dangling reference to a temporary [-Wdangling-reference] 714 | Mover const & mover = getMover(conv.to()); | ^~~~~ ../../master/src/Converter.cpp:714:71: note: the temporary was destroyed at the end of the full expression ‘lyx::getMover(lyx::Converter::to() const())’ 714 | Mover const & mover = getMover(conv.to()); | ~~~~~~~~^~~~~~~~~~~ ../../master/src/Converter.cpp:786:39: warning: possibly dangling reference to a temporary [-Wdangling-reference] 786 | Mover const & mover = getMover(conv.from()); | ^~~~~ ../../master/src/Converter.cpp:786:55: note: the temporary was destroyed at the end of the full expression ‘lyx::getMover(lyx::Converter::from() const())’ 786 | Mover const & mover = getMover(conv.from()); --- src/Converter.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Converter.h b/src/Converter.h index 091dbcd394..9e8249d72d 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: /// -- 2.39.5