Merge branch 'master' into nextversion
This commit is contained in:
5
ltable.c
5
ltable.c
@@ -278,9 +278,11 @@ LUAI_FUNC unsigned int luaH_realasize (const Table *t) {
|
||||
size |= (size >> 2);
|
||||
size |= (size >> 4);
|
||||
size |= (size >> 8);
|
||||
#if (UINT_MAX >> 14) > 3 /* unsigned int has more than 16 bits */
|
||||
size |= (size >> 16);
|
||||
#if (UINT_MAX >> 30) > 3
|
||||
size |= (size >> 32); /* unsigned int has more than 32 bits */
|
||||
#endif
|
||||
#endif
|
||||
size++;
|
||||
lua_assert(ispow2(size) && size/2 < t->alimit && t->alimit < size);
|
||||
@@ -710,7 +712,8 @@ static Node *getfreepos (Table *t) {
|
||||
** put new key in its main position; otherwise (colliding node is in its main
|
||||
** position), new key goes to an empty position.
|
||||
*/
|
||||
void luaH_newkey (lua_State *L, Table *t, const TValue *key, TValue *value) {
|
||||
static void luaH_newkey (lua_State *L, Table *t, const TValue *key,
|
||||
TValue *value) {
|
||||
Node *mp;
|
||||
TValue aux;
|
||||
if (l_unlikely(ttisnil(key)))
|
||||
|
||||
Reference in New Issue
Block a user