[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1306-g6411037

[Brad King]

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  6411037555f1bf7141671d5d8893dd6a3db7643b (commit)
       via  30e6ff951d52772b6bb73654ea33752368a92fe7 (commit)
      from  29c72b9951e9b6eeeaec5d938a61b3fbfe150e26 (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=6411037555f1bf7141671d5d8893dd6a3db7643b
commit 6411037555f1bf7141671d5d8893dd6a3db7643b
Merge: 29c72b9 30e6ff9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 23 09:16:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 23 09:16:27 2015 -0400

    Merge topic 'refactor-cmMakefile-properties' into next
    
    30e6ff95 cmState: Fix compilation on IBM XL compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30e6ff951d52772b6bb73654ea33752368a92fe7
commit 30e6ff951d52772b6bb73654ea33752368a92fe7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 23 09:11:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 23 09:11:37 2015 -0400

    cmState: Fix compilation on IBM XL compiler
    
    Delay use of the PositionType constructor until after SnapshotDataType
    is fully defined.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index abc3e92..d8f8306 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -834,6 +834,12 @@ cmState::Snapshot cmState::Pop(cmState::Snapshot originSnapshot)
   return Snapshot(this, originSnapshot.Position->CallStackParent);
 }
 
+cmState::Snapshot::Snapshot(cmState* state)
+  : State(state)
+  , Position()
+{
+}
+
 cmState::Snapshot::Snapshot(cmState* state, PositionType position)
   : State(state),
   Position(position)
diff --git a/Source/cmState.h b/Source/cmState.h
index 2e7310f..0d5300f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -44,7 +44,8 @@ public:
 
   class Snapshot {
   public:
-    Snapshot(cmState* state = 0, PositionType position = PositionType());
+    Snapshot(cmState* state = 0);
+    Snapshot(cmState* state, PositionType position);
 
     void SetListFile(std::string const& listfile);
 

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

Summary of changes:
 Source/cmState.cxx |    6 ++++++
 Source/cmState.h   |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake