[Cmake-commits] CMake branch, next, updated. v3.7.1-1702-g7554a08

[Daniel Pfeifer]

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  7554a08895ec9d2754bf159450126be6f5d5ac15 (commit)
       via  6881448971ff63c32dd7d380872369afdec9b7b4 (commit)
      from  aaa775916df2d1dbe5e09c91d0238f8271978c7c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7554a08895ec9d2754bf159450126be6f5d5ac15
commit 7554a08895ec9d2754bf159450126be6f5d5ac15
Merge: aaa7759 6881448
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Dec 12 03:05:48 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 12 03:05:48 2016 -0500

    Merge topic 'rebuild-lexers' into next
    
    68814489 fixup! Regenerate lexer source code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6881448971ff63c32dd7d380872369afdec9b7b4
commit 6881448971ff63c32dd7d380872369afdec9b7b4
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Dec 12 09:05:28 2016 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Dec 12 09:05:28 2016 +0100

    fixup! Regenerate lexer source code

diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h
index 1790aae..b9adee5 100644
--- a/Source/cmStandardLexer.h
+++ b/Source/cmStandardLexer.h
@@ -19,10 +19,12 @@
 #pragma warning(disable : 4786)
 #endif
 
-#if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
-#if !defined(__INTEL_COMPILER)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#endif
+#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 403
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #endif
 #endif

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

Summary of changes:
 Source/cmStandardLexer.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake