[Cmake-commits] CMake branch, next, updated. v3.2.2-2825-g6655d59

[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  6655d593788ce3ed12c5c6874e32baa58cd5fb92 (commit)
       via  b5a344b6e9e285a32afaa98bc5bb9a00e4358be6 (commit)
      from  f81b56b01dc792e6c1b7c2fb5792c0f92914429c (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=6655d593788ce3ed12c5c6874e32baa58cd5fb92
commit 6655d593788ce3ed12c5c6874e32baa58cd5fb92
Merge: f81b56b b5a344b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 06:20:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 17 06:20:16 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    b5a344b6 cmMakefile: Remove redundant conditions.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5a344b6e9e285a32afaa98bc5bb9a00e4358be6
commit b5a344b6e9e285a32afaa98bc5bb9a00e4358be6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 12:07:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 12:07:40 2015 +0200

    cmMakefile: Remove redundant conditions.
    
    This container is never empty.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 43490a3..6280e38 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1730,8 +1730,7 @@ void cmMakefile::AddDefinition(const std::string& name, const char* value)
     }
 
   this->Internal->SetDefinition(name, value);
-  if (!this->Internal->VarUsageStack.empty() &&
-      this->VariableInitialized(name))
+  if (this->VariableInitialized(name))
     {
     this->CheckForUnused("changing definition", name);
     this->Internal->VarUsageStack.top().erase(name);
@@ -1806,8 +1805,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
 void cmMakefile::AddDefinition(const std::string& name, bool value)
 {
   this->Internal->SetDefinition(name, value ? "ON" : "OFF");
-  if (!this->Internal->VarUsageStack.empty() &&
-      this->VariableInitialized(name))
+  if (this->VariableInitialized(name))
     {
     this->CheckForUnused("changing definition", name);
     this->Internal->VarUsageStack.top().erase(name);
@@ -1904,8 +1902,7 @@ void cmMakefile::CheckForUnused(const char* reason,
 void cmMakefile::RemoveDefinition(const std::string& name)
 {
   this->Internal->RemoveDefinition(name);
-  if (!this->Internal->VarUsageStack.empty() &&
-      this->VariableInitialized(name))
+  if (this->VariableInitialized(name))
     {
     this->CheckForUnused("unsetting", name);
     this->Internal->VarUsageStack.top().erase(name);

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

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


hooks/post-receive
-- 
CMake