Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-25

[awesomized/libmemcached] / libmemcached / csl / scanner.h

diff --git a/libmemcached/csl/scanner.h b/libmemcached/csl/scanner.h
index 789ad01e373ae140c09cad3a72ee04ceb185a6ac..571360b2a6b5dc918d1547383b136950a2b7e300 100644 (file)
--- a/libmemcached/csl/scanner.h
+++ b/libmemcached/csl/scanner.h
@@ -16,16 +16,25 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 #pragma GCC diagnostic ignored "-Wunused-result"
-#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
 #pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #endif
 
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
+
+#ifndef __INTEL_COMPILER
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif
+#endif
+
 #define YY_EXTRA_TYPE Context*
 
 
 
 
-#line 29 "libmemcached/csl/scanner.h"
+#line 38 "libmemcached/csl/scanner.h"
 
 #define  YY_INT_ALIGNED short int
 
@@ -355,9 +364,9 @@ extern int config_lex \
 #undef YY_DECL
 #endif
 
-#line 220 "libmemcached/csl/scanner.l"
+#line 229 "libmemcached/csl/scanner.l"
 
 
-#line 362 "libmemcached/csl/scanner.h"
+#line 371 "libmemcached/csl/scanner.h"
 #undef config_IN_HEADER
 #endif /* config_HEADER_H */