[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-176-g8d3c59f

[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  8d3c59f6a1e48f3b5788860933fd6ba9e53f846b (commit)
       via  c9852e1ba279747a4b70eb4eadd781695c72073d (commit)
       via  676b77c77c611b1ac58db420d743ae1b16ca03ea (commit)
      from  01066f3643a68ed4bb67504f3809f1c82e6e3cea (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=8d3c59f6a1e48f3b5788860933fd6ba9e53f846b
commit 8d3c59f6a1e48f3b5788860933fd6ba9e53f846b
Merge: 01066f3 c9852e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 03:28:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 03:28:51 2015 -0400

    Merge topic 'data-layout' into next
    
    c9852e1b fixup! cmPropertyMap: Remove chaining logic.
    676b77c7 fixup! cmPolicies: Store all statuses in a single bitset.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9852e1ba279747a4b70eb4eadd781695c72073d
commit c9852e1ba279747a4b70eb4eadd781695c72073d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 09:25:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 09:25:01 2015 +0200

    fixup! cmPropertyMap: Remove chaining logic.

diff --git a/Source/cmPropertyMap.h b/Source/cmPropertyMap.h
index 7410239..a9062db 100644
--- a/Source/cmPropertyMap.h
+++ b/Source/cmPropertyMap.h
@@ -14,8 +14,6 @@
 
 #include "cmProperty.h"
 
-class cmake;
-
 class cmPropertyMap : public std::map<std::string,cmProperty>
 {
 public:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=676b77c77c611b1ac58db420d743ae1b16ca03ea
commit 676b77c77c611b1ac58db420d743ae1b16ca03ea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 09:24:27 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 09:24:27 2015 +0200

    fixup! cmPolicies: Store all statuses in a single bitset.

diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 586ec87..5026893 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -373,8 +373,10 @@ void cmPolicies::PolicyMap::Set(cmPolicies::PolicyID id,
   this->Status[(POLICY_STATUS_COUNT * id) + OLD] = (status == OLD);
   this->Status[(POLICY_STATUS_COUNT * id) + WARN] = (status == WARN);
   this->Status[(POLICY_STATUS_COUNT * id) + NEW] = (status == NEW);
-  this->Status[(POLICY_STATUS_COUNT * id) + REQUIRED_ALWAYS] = (status == REQUIRED_ALWAYS);
-  this->Status[(POLICY_STATUS_COUNT * id) + REQUIRED_IF_USED] = (status == REQUIRED_IF_USED);
+  this->Status[(POLICY_STATUS_COUNT * id) + REQUIRED_ALWAYS] =
+      (status == REQUIRED_ALWAYS);
+  this->Status[(POLICY_STATUS_COUNT * id) + REQUIRED_IF_USED] =
+      (status == REQUIRED_IF_USED);
 }
 
 bool cmPolicies::PolicyMap::IsDefined(cmPolicies::PolicyID id) const

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

Summary of changes:
 Source/cmPolicies.cxx  |    6 ++++--
 Source/cmPropertyMap.h |    2 --
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake