[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3752-g2a540f0

[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  2a540f08c992093c992316a371ba48112604a94b (commit)
       via  ae6a5ea5a2119841b4a11b03f879ac426edbbdf8 (commit)
      from  9255e64504ca93566af2ed1f02808877619db94c (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=2a540f08c992093c992316a371ba48112604a94b
commit 2a540f08c992093c992316a371ba48112604a94b
Merge: 9255e64 ae6a5ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 7 10:21:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 7 10:21:13 2013 -0400

    Merge topic 'fix-lexer-include-order' into next
    
    ae6a5ea Include cmMakefile.h before cm*Lexer.h to get stdint.h first


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6a5ea5a2119841b4a11b03f879ac426edbbdf8
commit ae6a5ea5a2119841b4a11b03f879ac426edbbdf8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 7 10:14:58 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 7 10:19:40 2013 -0400

    Include cmMakefile.h before cm*Lexer.h to get stdint.h first
    
    Some generated cm*Lexer.h headers define preprocessor macros normally
    provided by <stdint.h>.  The latter is included indrectly by cmMakefile.h
    since commit 2268c41a (Optimize custom command full-path dependency
    lookup, 2013-08-06).  Adjust the order to avoid redefinition warnings.

diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 2f26b0c..dbeeb07 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -12,10 +12,10 @@
 #include "cmCommandArgumentParserHelper.h"
 
 #include "cmSystemTools.h"
-#include "cmCommandArgumentLexer.h"
-
 #include "cmMakefile.h"
 
+#include "cmCommandArgumentLexer.h"
+
 int cmCommandArgument_yyparse( yyscan_t yyscanner );
 //
 cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index 9c1795e..cc35f84 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -12,10 +12,10 @@
 #include "cmExprParserHelper.h"
 
 #include "cmSystemTools.h"
-#include "cmExprLexer.h"
-
 #include "cmMakefile.h"
 
+#include "cmExprLexer.h"
+
 int cmExpr_yyparse( yyscan_t yyscanner );
 //
 cmExprParserHelper::cmExprParserHelper()

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

Summary of changes:
 Source/cmCommandArgumentParserHelper.cxx |    4 ++--
 Source/cmExprParserHelper.cxx            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake