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

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

diff --git a/libmemcached/csl/scanner.h b/libmemcached/csl/scanner.h
index 1588c283081049a68d9bbb233825daa58c2c403a..34c5a3ac5c66dff3f5b2b6dddfa2bfa787169e0d 100644 (file)
--- a/libmemcached/csl/scanner.h
+++ b/libmemcached/csl/scanner.h
@@ -16,6 +16,17 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 #pragma GCC diagnostic ignored "-Wunused-result"
+#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*
@@ -23,7 +34,7 @@
 
 
 
-#line 27 "libmemcached/csl/scanner.h"
+#line 38 "libmemcached/csl/scanner.h"
 
 #define  YY_INT_ALIGNED short int
 
@@ -356,9 +367,9 @@ extern int config_lex \
 #undef YY_DECL
 #endif
 
-#line 218 "libmemcached/csl/scanner.l"
+#line 229 "libmemcached/csl/scanner.l"
 
 
-#line 363 "libmemcached/csl/scanner.h"
+#line 374 "libmemcached/csl/scanner.h"
 #undef config_IN_HEADER
 #endif /* config_HEADER_H */