[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7367-gfcf44d3

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fcf44d3e907b3ab585c515d6a24d3e9ee89edc57 (commit)
       via  f054201d12fa385f48abd967840c0d92595ca058 (commit)
       via  d1ac6ffd4aa4cc54dbf4b0bf59045576af4c1033 (commit)
      from  19486e0d4b4b8eb7ff82317c0ffda20be700a250 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf44d3e907b3ab585c515d6a24d3e9ee89edc57
commit fcf44d3e907b3ab585c515d6a24d3e9ee89edc57
Merge: 19486e0 f054201
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 2 04:53:33 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 2 04:53:33 2014 -0500

    Merge topic 'constify' into next
    
    f054201d cmMakefile: Return containers by const reference.
    d1ac6ffd cmMakefile: Fix minor indentation inconsistency.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f054201d12fa385f48abd967840c0d92595ca058
commit f054201d12fa385f48abd967840c0d92595ca058
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 2 10:52:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 2 10:52:35 2014 +0100

    cmMakefile: Return containers by const reference.
    
    They are not implicitly shared.

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;
   }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1ac6ffd4aa4cc54dbf4b0bf59045576af4c1033
commit d1ac6ffd4aa4cc54dbf4b0bf59045576af4c1033
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 2 10:48:59 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 2 10:49:33 2014 +0100

    cmMakefile: Fix minor indentation inconsistency.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 55a9d5c..1bcee2c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1573,8 +1573,8 @@ void cmMakefile::InitializeFromParent()
   const std::vector<cmValueWithOrigin> parentIncludes =
                                         parent->GetIncludeDirectoriesEntries();
   this->IncludeDirectoriesEntries.insert(this->IncludeDirectoriesEntries.end(),
-                                       parentIncludes.begin(),
-                                       parentIncludes.end());
+                                         parentIncludes.begin(),
+                                         parentIncludes.end());
 
   const std::vector<cmValueWithOrigin> parentOptions =
                                         parent->GetCompileOptionsEntries();
@@ -1585,8 +1585,8 @@ void cmMakefile::InitializeFromParent()
   const std::vector<cmValueWithOrigin> parentDefines =
                                       parent->GetCompileDefinitionsEntries();
   this->CompileDefinitionsEntries.insert(this->CompileDefinitionsEntries.end(),
-                                     parentDefines.begin(),
-                                     parentDefines.end());
+                                         parentDefines.begin(),
+                                         parentDefines.end());
 
   this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |   14 +++++++-------
 Source/cmMakefile.h   |    6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake