projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update after fixing clang issue with pragma.
[awesomized/libmemcached]
/
libmemcached
/
csl
/
parser.yy
diff --git
a/libmemcached/csl/parser.yy
b/libmemcached/csl/parser.yy
index d263aea4eca361f7e749e4d55f24e1cf40b2a098..486fb4b346efa9ddf0dc60126908fb5d83ed778e 100644
(file)
--- a/
libmemcached/csl/parser.yy
+++ b/
libmemcached/csl/parser.yy
@@
-62,6
+62,12
@@
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
+#ifndef __INTEL_COMPILER
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif
+#endif
+
int conf_lex(YYSTYPE* lvalp, void* scanner);
#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
int conf_lex(YYSTYPE* lvalp, void* scanner);
#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
@@
-228,7
+234,7
@@
statement:
expression:
SERVER HOSTNAME optional_port optional_weight
{
expression:
SERVER HOSTNAME optional_port optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3,
$4
)))
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3,
uint32_t($4)
)))
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@
-238,7
+244,7
@@
expression:
}
| SERVER IPADDRESS optional_port optional_weight
{
}
| SERVER IPADDRESS optional_port optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3,
$4
)))
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3,
uint32_t($4)
)))
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@
-248,7
+254,7
@@
expression:
}
| SOCKET string optional_weight
{
}
| SOCKET string optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str,
$3
)))
+ if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str,
uint32_t($3)
)))
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add socket: %s", $2.c_str);
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add socket: %s", $2.c_str);
@@
-261,11
+267,11
@@
expression:
}
| POOL_MIN NUMBER
{
}
| POOL_MIN NUMBER
{
- context->memc->configure.initial_pool_size=
$2
;
+ context->memc->configure.initial_pool_size=
uint32_t($2)
;
}
| POOL_MAX NUMBER
{
}
| POOL_MAX NUMBER
{
- context->memc->configure.max_pool_size=
$2
;
+ context->memc->configure.max_pool_size=
uint32_t($2)
;
}
| behaviors
;
}
| behaviors
;