summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-10-04 21:11:44 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-10-04 21:11:44 (GMT)
commit056b4120750b7c5230be468f4ca5dd21881ecbde (patch)
treef3714d17ffbbbbde8a6c17a1fcee6491ef896e12
parente3e6cbab95cbdc24b59aa1df1537393090b1c487 (diff)
downloadtcl-056b4120750b7c5230be468f4ca5dd21881ecbde.zip
tcl-056b4120750b7c5230be468f4ca5dd21881ecbde.tar.gz
tcl-056b4120750b7c5230be468f4ca5dd21881ecbde.tar.bz2
Bugfix MergeList.
-rw-r--r--generic/tclHAMT.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclHAMT.c b/generic/tclHAMT.c
index e1ccc89..0de245b 100644
--- a/generic/tclHAMT.c
+++ b/generic/tclHAMT.c
@@ -328,8 +328,7 @@ typedef struct AMNode {
*/
/* Bits in a size_t. Use as our branching factor. Max children per node. */
-//const int branchFactor = CHAR_BIT * sizeof(size_t);
-const int branchFactor = 2;
+const int branchFactor = CHAR_BIT * sizeof(size_t);
/*
* The operations on an ArrayMap:
@@ -851,7 +850,7 @@ ArrayMap AMMergeList(
}
return new;
}
- if (tally & am->kvMap) {
+ if (tally & am->amMap) {
/* Hash consistent with existing subnode child */
/* Merge the list into that subnode child... */