[Cmake-commits] CMake branch, next, updated. v3.2.2-3122-gad48a9c

[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  ad48a9c53f3878a275e2ea51d2a018fb370f0dd9 (commit)
       via  c8f04bed6f4d6b80b9e786cbbcee4061b3bad99a (commit)
      from  9df31719fefc33cefb508241dbb0bf474f6d93e0 (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=ad48a9c53f3878a275e2ea51d2a018fb370f0dd9
commit ad48a9c53f3878a275e2ea51d2a018fb370f0dd9
Merge: 9df3171 c8f04be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 08:57:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 24 08:57:27 2015 -0400

    Merge topic 'inject-state-snapshot' into next
    
    c8f04bed fixup! cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8f04bed6f4d6b80b9e786cbbcee4061b3bad99a
commit c8f04bed6f4d6b80b9e786cbbcee4061b3bad99a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 24 14:57:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 24 14:57:05 2015 +0200

    fixup! cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 87485b5..4e8ada4 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -310,8 +310,7 @@ cmLocalGenerator *
 cmGlobalVisualStudio10Generator::CreateLocalGenerator(cmLocalGenerator* parent,
                                                     cmState::Snapshot snapshot)
 {
-  return new cmLocalVisualStudio10Generator(
-    cmLocalVisualStudioGenerator::VS10, this, parent, snapshot);
+  return new cmLocalVisualStudio10Generator(this, parent, snapshot);
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake