[Cmake-commits] CMake branch, next, updated. v3.3.0-1659-gdb70a1c

[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  db70a1c79decc497a0c42ee543d57dfc53ae8000 (commit)
       via  93f0c176d8abd604902c8ecafa41b4b4a1a9b12b (commit)
      from  1aa00000ee9cc3514467d66832d127aa955a99fb (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=db70a1c79decc497a0c42ee543d57dfc53ae8000
commit db70a1c79decc497a0c42ee543d57dfc53ae8000
Merge: 1aa0000 93f0c17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 02:00:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 1 02:00:12 2015 -0400

    Merge topic 'cmState-policies' into next
    
    93f0c176 simplify


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f0c176d8abd604902c8ecafa41b4b4a1a9b12b
commit 93f0c176d8abd604902c8ecafa41b4b4a1a9b12b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 07:59:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 07:59:55 2015 +0200

    simplify

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 492a4d0..f425861 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1060,9 +1060,7 @@ bool cmState::Snapshot::PopPolicy()
 
 bool cmState::Snapshot::CanPopPolicyScope()
 {
-  PositionType pos = this->Position;
-  bool ok = (pos->Policies == pos->PolicyScope);
-  return ok;
+  return this->Position->Policies == this->Position->PolicyScope;
 }
 
 void cmState::Snapshot::SetPolicy(cmPolicies::PolicyID id,

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

Summary of changes:
 Source/cmState.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake