diff options
| author | David Lovemore | 2012-05-03 16:43:57 +0100 |
|---|---|---|
| committer | David Lovemore | 2012-05-03 16:43:57 +0100 |
| commit | 8f87261a136c91d4cd00d5ccc08b86ac864037ec (patch) | |
| tree | d296ba55ec6de62431ddb3f31368e1a7a300d125 /mps/code/table.c | |
| parent | 52db7a8d59afb7e43ab675de91a079245c3d104b (diff) | |
| parent | 9bf482ea08a4800df14251b30422a8cb9faf85b9 (diff) | |
| download | emacs-8f87261a136c91d4cd00d5ccc08b86ac864037ec.tar.gz emacs-8f87261a136c91d4cd00d5ccc08b86ac864037ec.zip | |
Merged from branch/2012-03-27/longest to pick up extra vararg fixes and casts on shift operands.
Copied from Perforce
Change: 178096
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/table.c')
| -rw-r--r-- | mps/code/table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mps/code/table.c b/mps/code/table.c index e1db04202b3..772e45d9d30 100644 --- a/mps/code/table.c +++ b/mps/code/table.c | |||
| @@ -157,7 +157,7 @@ extern Res TableCreate(Table *tableReturn, size_t length) | |||
| 157 | if(table == NULL) goto failMallocTable; | 157 | if(table == NULL) goto failMallocTable; |
| 158 | if (length < 2) length = 2; | 158 | if (length < 2) length = 2; |
| 159 | /* Table size is length rounded up to the next power of 2. */ | 159 | /* Table size is length rounded up to the next power of 2. */ |
| 160 | table->length = 1 << (sizeFloorLog2(length-1) + 1); | 160 | table->length = (size_t)1 << (sizeFloorLog2(length-1) + 1); |
| 161 | table->count = 0; | 161 | table->count = 0; |
| 162 | table->limit = (size_t)(.5 * length); | 162 | table->limit = (size_t)(.5 * length); |
| 163 | table->array = malloc(sizeof(TableEntryStruct) * length); | 163 | table->array = malloc(sizeof(TableEntryStruct) * length); |