diff options
| author | Brad King <brad.king@kitware.com> | 2006-08-08 14:00:28 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-08-08 14:00:28 -0400 |
| commit | a3836e09a22790f9b4a12628e37dd164158880e3 (patch) | |
| tree | 65e717189000aa0dc3cc701f03dbe61c1e5221f8 /Source/cmCommandArgumentLexer.cxx | |
| parent | 8f1aaf28c13094f21a835a5b0fe47f7813179126 (diff) | |
| download | cmake-a3836e09a22790f9b4a12628e37dd164158880e3.tar.gz | |
COMP: Moved duplicate flex-generated lexer warning suppression and cross-platform support code to a single cmStandardLexer.h included by all lexer sources. Added fix for macro redefinitions on Borland 5.8 compiler.
Diffstat (limited to 'Source/cmCommandArgumentLexer.cxx')
| -rw-r--r-- | Source/cmCommandArgumentLexer.cxx | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/Source/cmCommandArgumentLexer.cxx b/Source/cmCommandArgumentLexer.cxx index 1f49ad10a2..127ffe1352 100644 --- a/Source/cmCommandArgumentLexer.cxx +++ b/Source/cmCommandArgumentLexer.cxx @@ -477,30 +477,9 @@ Modify cmCommandArgumentLexer.h: */ -#include "cmCommandArgumentParserHelper.h" - -/* Disable some warnings. */ -#if defined(_MSC_VER) -# pragma warning ( disable : 4127 ) -# pragma warning ( disable : 4131 ) -# pragma warning ( disable : 4244 ) -# pragma warning ( disable : 4251 ) -# pragma warning ( disable : 4267 ) -# pragma warning ( disable : 4305 ) -# pragma warning ( disable : 4309 ) -# pragma warning ( disable : 4706 ) -# pragma warning ( disable : 4786 ) -#endif - -#if defined(__BORLANDC__) -# pragma warn -8008 /* condition always returns true */ -# pragma warn -8066 /* unreachable code */ -#endif +#include "cmStandardLexer.h" -/* Disable features we do not need. */ -#define YY_NEVER_INTERACTIVE 1 -#undef ECHO /* SGI termios defines this differently. */ -#define ECHO +#include "cmCommandArgumentParserHelper.h" /* Replace the lexer input function. */ #undef YY_INPUT @@ -510,16 +489,6 @@ Modify cmCommandArgumentLexer.h: /* Include the set of tokens from the parser. */ #include "cmCommandArgumentParserTokens.h" - -#if defined( _WIN32 ) && !defined( __CYGWIN__ ) -/* Handle Windows properly */ -# include <io.h> -# if defined( _MSC_VER ) -# define isatty _isatty -# endif -# define YY_NO_UNISTD_H 1 -#endif - /*--------------------------------------------------------------------------*/ |