Merge in additional work to handle "weight" for servers.

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

diff --git a/libmemcached/options/scanner.h b/libmemcached/options/scanner.h
index 5c2473f4f79a30e6dab791ca0a2cb8efb90fb2ee..de36df46cbd248042725a1955008d06cf6fa20ef 100644 (file)
--- a/libmemcached/options/scanner.h
+++ b/libmemcached/options/scanner.h
@@ -7,7 +7,6 @@
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-fpermissive"
 
 #include <libmemcached/options/context.h>
 #include <libmemcached/options/parser.h>
@@ -19,7 +18,7 @@
 
 
 
-#line 23 "libmemcached/options/scanner.h"
+#line 22 "libmemcached/options/scanner.h"
 
 #define  YY_INT_ALIGNED short int
 
@@ -471,9 +470,9 @@ extern int config_lex \
 #undef YY_DECL
 #endif
 
-#line 225 "libmemcached/options/scanner.l"
+#line 220 "libmemcached/options/scanner.l"
 
 
-#line 478 "libmemcached/options/scanner.h"
+#line 477 "libmemcached/options/scanner.h"
 #undef config_IN_HEADER
 #endif /* config_HEADER_H */