projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: merge TangentOrg/ddm4
[m6w6/libmemcached]
/
libmemcached
/
csl
/
parser.yy
diff --git
a/libmemcached/csl/parser.yy
b/libmemcached/csl/parser.yy
index 243c4fcd835209b526ba76f76461b396e90fb507..dd9c720b9631009f2ac0277eb51c2f2fdc7ae2ff 100644
(file)
--- a/
libmemcached/csl/parser.yy
+++ b/
libmemcached/csl/parser.yy
@@
-50,10
+50,10
@@
class Context;
%defines "libmemcached/csl/parser.h"
%lex-param { yyscan_t *scanner }
%name-prefix="config_"
%defines "libmemcached/csl/parser.h"
%lex-param { yyscan_t *scanner }
%name-prefix="config_"
-%parse-param { Context *context }
+%parse-param {
class
Context *context }
%parse-param { yyscan_t *scanner }
%pure-parser
%parse-param { yyscan_t *scanner }
%pure-parser
-%require "2.
4
"
+%require "2.
5
"
%start begin
%verbose
%start begin
%verbose
@@
-66,13
+66,14
@@
class Context;
#include <libmemcached/csl/scanner.h>
#ifndef __INTEL_COMPILER
#include <libmemcached/csl/scanner.h>
#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#
pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#ifndef __INTEL_COMPILER
#endif
#ifndef __INTEL_COMPILER
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
+# ifndef __clang__
+# pragma GCC diagnostic ignored "-Wlogical-op"
+# pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+# endif
#endif
int conf_lex(YYSTYPE* lvalp, void* scanner);
#endif
int conf_lex(YYSTYPE* lvalp, void* scanner);
@@
-291,7
+292,7
@@
behaviors:
parser_abort(context, "--NAMESPACE can only be called once");
}
parser_abort(context, "--NAMESPACE can only be called once");
}
- if ((context->rc= memcached_set_namespace(context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_set_namespace(
*
context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
{
parser_abort(context, memcached_last_error_message(context->memc));
}
{
parser_abort(context, memcached_last_error_message(context->memc));
}