[Cmake-commits] CMake branch, next, updated. v3.2.2-2366-g6db363e

[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  6db363e888e2ed8de6fad8b58655b409167cdbfb (commit)
       via  e81281e133e9e615c25fd03f26616ee1ee824ce0 (commit)
       via  64ce0175c8a1b57e4944367f9ae432a99aa54c9f (commit)
      from  47c1254dbb9ecdbfaf9b708ea0919fb8b6b33c61 (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=6db363e888e2ed8de6fad8b58655b409167cdbfb
commit 6db363e888e2ed8de6fad8b58655b409167cdbfb
Merge: 47c1254 e81281e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 30 17:52:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 30 17:52:23 2015 -0400

    Merge topic 'refactor-cmDefinitions' into next
    
    e81281e1 Revert "cmMakefile: Implement RaiseScope without relying on Parent."
    64ce0175 Revert "cmMakefile: Implement RaiseScope in terms of local Get method."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e81281e133e9e615c25fd03f26616ee1ee824ce0
commit e81281e133e9e615c25fd03f26616ee1ee824ce0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 30 23:49:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 30 23:49:24 2015 +0200

    Revert "cmMakefile: Implement RaiseScope without relying on Parent."
    
    This reverts commit 82a57e665bc22e6d5e74211210e35fa8c8238019.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4ca800e..6290af5 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -128,16 +128,14 @@ public:
 
   bool RaiseScope(std::string const& var, const char* varDef, cmMakefile* mf)
   {
-    if(this->VarStack.size() > 1)
+    cmDefinitions& cur = this->VarStack.back();
+    if(cmDefinitions* up = cur.GetParent())
       {
-      cmDefinitions& cur = this->VarStack.back();
-
       // First localize the definition in the current scope.
       cur.Get(var);
 
       // Now update the definition in the parent scope.
-      cmDefinitions& up = *(++this->VarStack.rbegin());
-      up.Set(var, varDef);
+      up->Set(var, varDef);
       }
     else if(cmLocalGenerator* plg = mf->GetLocalGenerator()->GetParent())
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64ce0175c8a1b57e4944367f9ae432a99aa54c9f
commit 64ce0175c8a1b57e4944367f9ae432a99aa54c9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 30 23:49:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 30 23:49:19 2015 +0200

    Revert "cmMakefile: Implement RaiseScope in terms of local Get method."
    
    This reverts commit ad831a56ec910ea06b44189d04d52a5f84518432.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b8e9148..4ca800e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -130,8 +130,10 @@ public:
   {
     if(this->VarStack.size() > 1)
       {
+      cmDefinitions& cur = this->VarStack.back();
+
       // First localize the definition in the current scope.
-      this->GetDefinition(var);
+      cur.Get(var);
 
       // Now update the definition in the parent scope.
       cmDefinitions& up = *(++this->VarStack.rbegin());

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

Summary of changes:
 Source/cmMakefile.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake