diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-14 14:52:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-14 14:52:05 (GMT) |
| commit | 788581883fef05820f3f83ec5d1456490bc2397f (patch) | |
| tree | 00c32a850d1b6701a7ba7ad40ead0d27415b09c1 /Source/cmStandardLexer.h | |
| parent | 60e5f61917815289c80c31880e5c90bdf81eefb8 (diff) | |
| parent | c5df1f165c7f8f1e31e3144d326c6836af2e678d (diff) | |
| download | CMake-788581883fef05820f3f83ec5d1456490bc2397f.zip CMake-788581883fef05820f3f83ec5d1456490bc2397f.tar.gz CMake-788581883fef05820f3f83ec5d1456490bc2397f.tar.bz2 | |
Merge topic 'rebuild-lexers'
c5df1f16 Regenerate lexer source code
Diffstat (limited to 'Source/cmStandardLexer.h')
| -rw-r--r-- | Source/cmStandardLexer.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index 234aef5..b9adee5 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -3,8 +3,11 @@ #ifndef cmStandardLexer_h #define cmStandardLexer_h +#include <cmConfigure.h> // IWYU pragma: keep + /* Disable some warnings. */ #if defined(_MSC_VER) +#pragma warning(disable : 4018) #pragma warning(disable : 4127) #pragma warning(disable : 4131) #pragma warning(disable : 4244) @@ -16,13 +19,24 @@ #pragma warning(disable : 4786) #endif -/* Define isatty on windows. */ +#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 + +/* Make sure isatty is available. */ #if defined(_WIN32) && !defined(__CYGWIN__) #include <io.h> #if defined(_MSC_VER) #define isatty _isatty #endif -#define YY_NO_UNISTD_H 1 +#else +#include <unistd.h> // IWYU pragma: export #endif /* Make sure malloc and free are available on QNX. */ @@ -36,4 +50,12 @@ #define YY_NO_UNPUT 1 #define ECHO +#include <cm_kwiml.h> +typedef KWIML_INT_int8_t flex_int8_t; +typedef KWIML_INT_uint8_t flex_uint8_t; +typedef KWIML_INT_int16_t flex_int16_t; +typedef KWIML_INT_uint16_t flex_uint16_t; +typedef KWIML_INT_int32_t flex_int32_t; +typedef KWIML_INT_uint32_t flex_uint32_t; + #endif |