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 master has been updated
via 881e1ed5d2998c3d60bc52513ad1bab22afe551f (commit)
via b46877cee6679ac499ce79be22dbc8b3eb8dc5da (commit)
via d9ec931c0fa41944b0221fb6b5172b5e0938e7bf (commit)
from f11b3a08be1882775d164071732ee04c2ab1a7c8 (commit)
Summary of changes:
commit 881e1ed5d2998c3d60bc52513ad1bab22afe551f
Merge: f11b3a0 b46877c
Author: Roman Tokarev <[email protected]>
Date: Tue Apr 19 11:26:56 2011 +0400
Merge remote branch 'origin/master-stable'
commit b46877cee6679ac499ce79be22dbc8b3eb8dc5da
Merge: d9ec931 666fb74
Author: Roman Tokarev <[email protected]>
Date: Tue Apr 19 11:24:21 2011 +0400
Merge branch 'master-stable' of farm.corp.mail.ru:tarantool into
master-stable
commit d9ec931c0fa41944b0221fb6b5172b5e0938e7bf
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/cfg/prscfg.c b/cfg/prscfg.c
index cc4ef3a..afc56ab 100644
--- a/cfg/prscfg.c
+++ b/cfg/prscfg.c
@@ -1770,7 +1770,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 173 "prscfg.y"
{
- OptDef *str;
+ OptDef *str;
NameAtom *idx;
MakeAtom(idx, NULL);
@@ -1787,7 +1787,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 184 "prscfg.y"
{
- OptDef *str;
+ OptDef *str;
NameAtom *idx;
MakeAtom(idx, NULL);
@@ -2100,7 +2100,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
