diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-08 15:17:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-08 15:18:28 (GMT) |
| commit | b63f508e4d7ccb8f543512630394a4021a14cab2 (patch) | |
| tree | e91b0d948bd9375b7f9d5892db64ed819a77a3f2 | |
| parent | 0bd964096859944ae28506fc8c0789df252865a6 (diff) | |
| parent | 879bd7fd9c84fa72001632818fce43339d755e3b (diff) | |
| download | CMake-b63f508e4d7ccb8f543512630394a4021a14cab2.zip CMake-b63f508e4d7ccb8f543512630394a4021a14cab2.tar.gz CMake-b63f508e4d7ccb8f543512630394a4021a14cab2.tar.bz2 | |
Merge topic 'GetExecutionListFile-by-ref'
879bd7fd9c cmStateSnapshot: Return const reference from GetExecutionListFile()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5186
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 | ||||
| -rw-r--r-- | Source/cmStateSnapshot.cxx | 2 | ||||
| -rw-r--r-- | Source/cmStateSnapshot.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8097dd1..ebbe3e7 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3347,7 +3347,7 @@ bool cmMakefile::IsLoopBlock() const return !this->LoopBlockCounter.empty() && this->LoopBlockCounter.top() > 0; } -std::string cmMakefile::GetExecutionFilePath() const +std::string const& cmMakefile::GetExecutionFilePath() const { assert(this->StateSnapshot.IsValid()); return this->StateSnapshot.GetExecutionListFile(); @@ -3357,8 +3357,8 @@ bool cmMakefile::ExpandArguments(std::vector<cmListFileArgument> const& inArgs, std::vector<std::string>& outArgs, const char* filename) const { - std::string efp = this->GetExecutionFilePath(); if (!filename) { + auto const& efp = this->GetExecutionFilePath(); filename = efp.c_str(); } std::string value; @@ -3389,8 +3389,8 @@ bool cmMakefile::ExpandArguments( std::vector<cmListFileArgument> const& inArgs, std::vector<cmExpandedCommandArgument>& outArgs, const char* filename) const { - std::string efp = this->GetExecutionFilePath(); if (!filename) { + auto const& efp = this->GetExecutionFilePath(); filename = efp.c_str(); } std::string value; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 7bcb031..0a6e6e2 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -942,7 +942,7 @@ public: const char* GetDefineFlagsCMP0059() const; - std::string GetExecutionFilePath() const; + std::string const& GetExecutionFilePath() const; void EnforceDirectoryLevelRules() const; diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index 3fcf61c..1e20abb 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -53,7 +53,7 @@ void cmStateSnapshot::SetListFile(const std::string& listfile) *this->Position->ExecutionListFile = listfile; } -std::string cmStateSnapshot::GetExecutionListFile() const +std::string const& cmStateSnapshot::GetExecutionListFile() const { return *this->Position->ExecutionListFile; } diff --git a/Source/cmStateSnapshot.h b/Source/cmStateSnapshot.h index 0ffd972..d06cba3 100644 --- a/Source/cmStateSnapshot.h +++ b/Source/cmStateSnapshot.h @@ -32,7 +32,7 @@ public: void SetListFile(std::string const& listfile); - std::string GetExecutionListFile() const; + std::string const& GetExecutionListFile() const; std::vector<cmStateSnapshot> GetChildren(); |