Merge in local trunk

[m6w6/libmemcached] / libmemcached / options / scanner.cc

diff --git a/libmemcached/options/scanner.cc b/libmemcached/options/scanner.cc
index b6143087c24ed1bd6dd18511126f999fc335a788..84d1c69ce5c121bba159756444b0df9abafe3d9a 100644 (file)
--- a/libmemcached/options/scanner.cc
+++ b/libmemcached/options/scanner.cc
@@ -1,15 +1,15 @@
 #line 2 "libmemcached/options/scanner.cc"
 #line 22 "libmemcached/options/scanner.l"
 
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
+#include <libmemcached/common.h>
 #include <libmemcached/options/context.h>
 #include <libmemcached/options/parser.h>
-#include <libmemcached/options/string.h>
 #include <libmemcached/options/symbol.h>
 
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
 #define YY_EXTRA_TYPE Context*
 
 
@@ -1872,7 +1872,7 @@ YY_RULE_SETUP
       yylval->server.weight= 1;
       yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
       if (yylval->server.c_str)
-        yylval->server.length= yyleng;
+        yylval->server.size= yyleng;
       return IPADDRESS;
     }
        YY_BREAK
@@ -1886,13 +1886,13 @@ YY_RULE_SETUP
         yylval->server.weight= 1;
         yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
         if (yylval->server.c_str)
-          yylval->server.length= yyleng;
+          yylval->server.size= yyleng;
 
         return HOSTNAME;
       }
 
       yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
+      yylval->string.size = yyleng;
 
       return STRING;
     }
@@ -1902,7 +1902,7 @@ YY_RULE_SETUP
 #line 185 "libmemcached/options/scanner.l"
 {
       yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
+      yylval->string.size = yyleng;
       return QUOTED_STRING;
     }
        YY_BREAK