[Cmake-commits] CMake branch, next, updated. v3.2.2-2914-ge6a4f19

[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  e6a4f19642004c0701c268547afa89489fc8516f (commit)
       via  6e9fe23eb44d3da68d8ca4b75e821681a7b1b23e (commit)
      from  b804271ff51f04359d95df453bebcf7dbb7eaa7a (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=e6a4f19642004c0701c268547afa89489fc8516f
commit e6a4f19642004c0701c268547afa89489fc8516f
Merge: b804271 6e9fe23
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 14:24:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 14:24:48 2015 -0400

    Merge topic 'clean-up-vs-generators' into next
    
    6e9fe23e fixup! VS: Simplify setting of flag table.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e9fe23eb44d3da68d8ca4b75e821681a7b1b23e
commit 6e9fe23eb44d3da68d8ca4b75e821681a7b1b23e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 14:24:08 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 18 14:24:08 2015 -0400

    fixup! VS: Simplify setting of flag table.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index d11769f..1d27086 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1843,9 +1843,6 @@ bool cmLocalVisualStudio7Generator
               tool = Options::FortranCompiler;
               table = cmLocalVisualStudio7GeneratorFortranFlagTable;
               }
-            cmGlobalVisualStudio7Generator* gg =
-              static_cast<cmGlobalVisualStudio7Generator*>(
-                                                      this->GlobalGenerator);
             Options fileOptions(this, tool, table,
                                 gg->ExtraFlagTable);
             fileOptions.Parse(fc.CompileFlags.c_str());

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    3 ---
 1 file changed, 3 deletions(-)


hooks/post-receive
-- 
CMake