diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-02-02 09:52:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-02-02 09:52:35 (GMT) |
| commit | f054201d12fa385f48abd967840c0d92595ca058 (patch) | |
| tree | 157809b1d25028282f3c9c7f9d74520bef2ef6ac | |
| parent | d1ac6ffd4aa4cc54dbf4b0bf59045576af4c1033 (diff) | |
| download | CMake-f054201d12fa385f48abd967840c0d92595ca058.zip CMake-f054201d12fa385f48abd967840c0d92595ca058.tar.gz CMake-f054201d12fa385f48abd967840c0d92595ca058.tar.bz2 | |
cmMakefile: Return containers by const reference.
They are not implicitly shared.
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 1bcee2c..f248c57 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1570,19 +1570,19 @@ void cmMakefile::InitializeFromParent() // Initialize definitions with the closure of the parent scope. this->Internal->VarStack.top() = parent->Internal->VarStack.top().Closure(); - const std::vector<cmValueWithOrigin> parentIncludes = + const std::vector<cmValueWithOrigin>& parentIncludes = parent->GetIncludeDirectoriesEntries(); this->IncludeDirectoriesEntries.insert(this->IncludeDirectoriesEntries.end(), parentIncludes.begin(), parentIncludes.end()); - const std::vector<cmValueWithOrigin> parentOptions = + const std::vector<cmValueWithOrigin>& parentOptions = parent->GetCompileOptionsEntries(); this->CompileOptionsEntries.insert(this->CompileOptionsEntries.end(), parentOptions.begin(), parentOptions.end()); - const std::vector<cmValueWithOrigin> parentDefines = + const std::vector<cmValueWithOrigin>& parentDefines = parent->GetCompileDefinitionsEntries(); this->CompileDefinitionsEntries.insert(this->CompileDefinitionsEntries.end(), parentDefines.begin(), diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 66a33bb..45f3b9f 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -853,15 +853,15 @@ public: /** Set whether or not to report a CMP0000 violation. */ void SetCheckCMP0000(bool b) { this->CheckCMP0000 = b; } - std::vector<cmValueWithOrigin> GetIncludeDirectoriesEntries() const + const std::vector<cmValueWithOrigin>& GetIncludeDirectoriesEntries() const { return this->IncludeDirectoriesEntries; } - std::vector<cmValueWithOrigin> GetCompileOptionsEntries() const + const std::vector<cmValueWithOrigin>& GetCompileOptionsEntries() const { return this->CompileOptionsEntries; } - std::vector<cmValueWithOrigin> GetCompileDefinitionsEntries() const + const std::vector<cmValueWithOrigin>& GetCompileDefinitionsEntries() const { return this->CompileDefinitionsEntries; } |