diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-08 17:54:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-08 17:54:58 (GMT) |
| commit | f181f27cd1800065b43b7916b6b5f57a8ac114f3 (patch) | |
| tree | 251c7adacf22fbdfd2d179fc7e96f180f5e8f033 /Source | |
| parent | cedf4550be6adf59a4e51b122569aa702706171e (diff) | |
| parent | ae6a5ea5a2119841b4a11b03f879ac426edbbdf8 (diff) | |
| download | CMake-f181f27cd1800065b43b7916b6b5f57a8ac114f3.zip CMake-f181f27cd1800065b43b7916b6b5f57a8ac114f3.tar.gz CMake-f181f27cd1800065b43b7916b6b5f57a8ac114f3.tar.bz2 | |
Merge topic 'fix-lexer-include-order'
ae6a5ea Include cmMakefile.h before cm*Lexer.h to get stdint.h first
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCommandArgumentParserHelper.cxx | 4 | ||||
| -rw-r--r-- | Source/cmExprParserHelper.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
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() |