projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in namespace fixes for binary protocol.
[m6w6/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 6a7bd9b9f7378d3c011a00e61265db5fbfa8f98c..8e87230ade8c10e534d2d3c8db618ea31c3948c3 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-40,6
+40,8
@@
#include <stdint.h>
#include <libmemcached/common.h>
#include <stdint.h>
#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
+
#include <libmemcached/options/context.h>
#include <libmemcached/options/symbol.h>
#include <libmemcached/options/scanner.h>
#include <libmemcached/options/context.h>
#include <libmemcached/options/symbol.h>
#include <libmemcached/options/scanner.h>
@@
-185,7
+187,7
@@
statement:
}
| INCLUDE ' ' string
{
}
| INCLUDE ' ' string
{
- if ((context->rc= memcached_parse_configure_file(context->memc, $3.c_str, $3.size)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_parse_configure_file(
*
context->memc, $3.c_str, $3.size)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);
}
{
parser_abort(context, NULL);
}
@@
-228,7
+230,7
@@
expression:
behaviors:
NAMESPACE string
{
behaviors:
NAMESPACE string
{
- if ((context->rc= memcached_set_
prefix_key
(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, NULL);;
}
{
parser_abort(context, NULL);;
}