merge from gcc
This commit is contained in:
parent
0aa92b58af
commit
686e72d729
|
@ -1,3 +1,8 @@
|
||||||
|
2003-10-30 Josef Zlomek <zlomekj@suse.cz>
|
||||||
|
|
||||||
|
* hashtab.c (htab_find_slot_with_hash): Decrease n_deleted
|
||||||
|
instead of increasing n_elements when inserting to deleted slot.
|
||||||
|
|
||||||
2003-10-20 J. Brobecker <brobecker@gnat.com>
|
2003-10-20 J. Brobecker <brobecker@gnat.com>
|
||||||
|
|
||||||
* cplus-dem.c (demangle_template): Register a new Btype only
|
* cplus-dem.c (demangle_template): Register a new Btype only
|
||||||
|
|
|
@ -535,14 +535,14 @@ htab_find_slot_with_hash (htab, element, hash, insert)
|
||||||
if (insert == NO_INSERT)
|
if (insert == NO_INSERT)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
htab->n_elements++;
|
|
||||||
|
|
||||||
if (first_deleted_slot)
|
if (first_deleted_slot)
|
||||||
{
|
{
|
||||||
|
htab->n_deleted--;
|
||||||
*first_deleted_slot = EMPTY_ENTRY;
|
*first_deleted_slot = EMPTY_ENTRY;
|
||||||
return first_deleted_slot;
|
return first_deleted_slot;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
htab->n_elements++;
|
||||||
return &htab->entries[index];
|
return &htab->entries[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue