diff options
| author | Joe George <joe@zeroc.com> | 2015-06-04 11:23:18 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-06-04 11:26:04 -0400 |
| commit | bc94f235d44b4927d722dd8688571648a61d65d4 (patch) | |
| tree | fa5de69557ecf4167d0451536d7e8cae70b19f64 /cpp/include | |
| parent | Fixed Ice/location failure with Ice.ThreadSafeInterrupt (ICE-6559) (diff) | |
| download | ice-bc94f235d44b4927d722dd8688571648a61d65d4.tar.bz2 ice-bc94f235d44b4927d722dd8688571648a61d65d4.tar.xz ice-bc94f235d44b4927d722dd8688571648a61d65d4.zip | |
Fix ICE-6556 - Fix clang warning
Fix clang warning in flex generated code
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/IceUtil/ScannerConfig.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h index ccd17624c8f..c58cf770d9a 100644 --- a/cpp/include/IceUtil/ScannerConfig.h +++ b/cpp/include/IceUtil/ScannerConfig.h @@ -18,7 +18,7 @@ // in flex generated Scanners are defined. // // in C99 conformant compilers we don't need to include it because the -// header is included by inttypes.h, that is included by the gernated +// header is included by inttypes.h, that is included by the gernated // Scanners. // #if defined(_MSC_VER) && (_MSC_VER >= 1600) @@ -26,17 +26,17 @@ #endif // -// Apple clang++ >= 5.1 deprecate 'register' storage class specifier +// Clang++ >= 5.1 deprecate 'register' storage class specifier // used by lex generated Scanners. // -#if defined(__clang__) && defined(__apple_build_version__) && __apple_build_version__ >= 5030038 +#if defined(__clang__) # pragma clang diagnostic ignored "-Wdeprecated-register" #endif // // Avoid old style cast warnings in generated scanners -// +// #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wold-style-cast" #endif |