[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-991-g3272d0a

[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  3272d0abcb5383b6e2a90c57a94c0a406bcc07ee (commit)
       via  773d6fafdf9b8812a4a1b9ca4cc6286f50e8ab4c (commit)
      from  ceb1833d4c78f5756fe8024c24997d1a33901590 (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=3272d0abcb5383b6e2a90c57a94c0a406bcc07ee
commit 3272d0abcb5383b6e2a90c57a94c0a406bcc07ee
Merge: ceb1833 773d6fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 12 04:09:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 12 04:09:45 2015 -0400

    Merge topic 'fix-command-rename' into next
    
    773d6faf fixup! cmState: Restore renamed commands on cleanup.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=773d6fafdf9b8812a4a1b9ca4cc6286f50e8ab4c
commit 773d6fafdf9b8812a4a1b9ca4cc6286f50e8ab4c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 12 10:02:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 12 10:03:14 2015 +0200

    fixup! cmState: Restore renamed commands on cleanup.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 27324bf..042fabe 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -416,13 +416,13 @@ void cmState::RemoveUserDefinedCommands()
       delete j->second;
       this->Commands.erase(j++);
       }
+    else if (j->first != j->second->GetName())
+      {
+      renamedCommands.push_back(j->second);
+      this->Commands.erase(j++);
+      }
     else
       {
-      if (j->first != j->second->GetName())
-        {
-        renamedCommands.push_back(j->second);
-        this->Commands.erase(j);
-        }
       ++j;
       }
     }

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

Summary of changes:
 Source/cmState.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake