[Cmake-commits] CMake branch, next, updated. v3.2.2-2569-gea1db6c

Stephen Kelly steveire at gmail.com
Wed May 6 02:02:36 EDT 2015


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  ea1db6c43d9709169525ee481670e187b7293273 (commit)
       via  ca021ca377980243db5aea1a503c787d608d0a36 (commit)
      from  dcce21d77e98066a420e28a253f112443002e8d0 (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=ea1db6c43d9709169525ee481670e187b7293273
commit ea1db6c43d9709169525ee481670e187b7293273
Merge: dcce21d ca021ca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 6 02:02:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 6 02:02:35 2015 -0400

    Merge topic 'refactor-cmLocalGenerator' into next
    
    ca021ca3 fixup! cmState: Add an accessor for Parent snapshot and a validity check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca021ca377980243db5aea1a503c787d608d0a36
commit ca021ca377980243db5aea1a503c787d608d0a36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 6 07:57:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 6 07:57:09 2015 +0200

    fixup! cmState: Add an accessor for Parent snapshot and a validity check.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 7a1c715..4965ae3 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -675,7 +675,7 @@ void cmState::Snapshot::SetRelativePathTopBinary(const char* dir)
 
 bool cmState::Snapshot::IsValid() const
 {
-  return this->State;
+  return this->State ? true : false;
 }
 
 cmState::Snapshot cmState::Snapshot::GetParent() const

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

Summary of changes:
 Source/cmState.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list