This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch core-lua has been updated
via af7de55964269885660c309c41baa162408a37ff (commit)
from 96893ab05a26b7093c6bba37d4c3d989fb013daa (commit)
Summary of changes:
third_party/confetti/prscfg.c | 6 +++---
third_party/khash.h | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
commit af7de55964269885660c309c41baa162408a37ff
Author: Roman Tokarev <[email protected]>
Date: Tue Apr 19 11:21:51 2011 +0400
third_party/khash.h: Fix compilation under gcc 4.5.2.
Update auto generated (by confetti) cfg/prscfg.c.
diff --git a/third_party/confetti/prscfg.c b/third_party/confetti/prscfg.c
index fa30e44..25cc30c 100644
--- a/third_party/confetti/prscfg.c
+++ b/third_party/confetti/prscfg.c
@@ -1700,7 +1700,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 147 "prscfg.y"
{
- OptDef *str;
+ OptDef *str;
NameAtom *idx;
MakeAtom(idx, NULL);
@@ -1717,7 +1717,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 158 "prscfg.y"
{
- OptDef *str;
+ OptDef *str;
NameAtom *idx;
MakeAtom(idx, NULL);
@@ -2012,7 +2012,7 @@ compileName(OptDef *def) {
return 1;
if (index >= 0) {
- beginPtr->index = index;
+ endPtr->index = index;
index = -1;
}
diff --git a/third_party/khash.h b/third_party/khash.h
index 3ed8164..e88c553 100644
--- a/third_party/khash.h
+++ b/third_party/khash.h
@@ -231,7 +231,8 @@ static const double __ac_HASH_UPPER = 0.77;
{ \
if (h && h->flags) { \
memset(h->flags, 0xaa, ((h->n_buckets>>4) + 1) *
sizeof(uint32_t)); \
- h->avg_size = (h->avg_size * (double)h->clears_cnt +
(double)h->size) / (double)(++h->clears_cnt); \
+ h->avg_size = (h->avg_size * (double)h->clears_cnt +
(double)h->size) / (double)(h->clears_cnt + 1); \
+ h->clears_cnt++; \
h->size = h->n_occupied = 0; \
if (h->resize_wat && (h->n_buckets >
*(h->resize_wat))) \
kh_resize_##name(h, *(h->resize_wat) - 1); \
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
