diff options
| author | Jose <jose@zeroc.com> | 2012-08-08 01:33:30 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-08 01:33:30 +0200 |
| commit | 6ed900b96833a2bfd1a37c7a6ba2112c04312b49 (patch) | |
| tree | 07f1fbb33f7da9084198f55082d582cb6194eb38 /cpp/src/FreezeScript/Scanner.l | |
| parent | fixes for Scanner.l & VC comilers (diff) | |
| download | ice-6ed900b96833a2bfd1a37c7a6ba2112c04312b49.tar.bz2 ice-6ed900b96833a2bfd1a37c7a6ba2112c04312b49.tar.xz ice-6ed900b96833a2bfd1a37c7a6ba2112c04312b49.zip | |
remove ScannerConfig.h > move fixes to Scanner.l
Diffstat (limited to 'cpp/src/FreezeScript/Scanner.l')
| -rw-r--r-- | cpp/src/FreezeScript/Scanner.l | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l index a78144547c8..81974e656b5 100644 --- a/cpp/src/FreezeScript/Scanner.l +++ b/cpp/src/FreezeScript/Scanner.l @@ -9,7 +9,6 @@ // // ********************************************************************** -#include <IceUtil/ScannerConfig.h> #include <FreezeScript/GrammarUtil.h> // Before Grammar.h, so that YYSTYPE is defined #include <FreezeScript/Grammar.h> #include <IceUtil/InputUtil.h> @@ -21,12 +20,25 @@ #if defined(_MSC_VER) && defined(ICE_64) // +// '=' : conversion from 'size_t' to 'int', possible loss of data +// The result of fread() is a size_t and gets inserted into an int +// +# pragma warning( 4 : 4267 ) +// // 'initializing' : conversion from '__int64' to 'int', possible loss of data // Puts a pointer-difference into an int // # pragma warning( 4 : 4244 ) #endif +#ifdef _MSC_VER +# ifdef freeze_script_wrap +# undef freeze_script_wrap +# define freeze_script_wrap() 1 +# endif +# define YY_NO_UNISTD_H +#endif + using namespace std; using namespace FreezeScript; |