diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2012-02-03 19:56:22 +0400 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2012-02-03 19:56:22 +0400 |
commit | ccd9a5c6da392acc75d9c0fc643b43e775c53d5c (patch) | |
tree | 0aa1b0fe6e457e6406c4fe9f5fe75f9d86aa5b30 /finalize.c | |
parent | 5742f863a8db6d2dd118c21c6d8cfb11d0beb821 (diff) | |
download | bdwgc-ccd9a5c6da392acc75d9c0fc643b43e775c53d5c.tar.gz |
Declare privately and use handy GC_base_C() for constant object pointers
* dbg_mlc.c (GC_debug_change_stubborn, GC_debug_end_stubborn_change):
Use GC_base_C() instead of GC_base() (remove cast to void pointer).
* finalize.c (GC_general_register_disappearing_link): Likewise.
* finalize.c (GC_register_disappearing_link, GC_finalize): Remove
redundant cast to void pointer and ptr_t.
* include/private/gc_priv.h (GC_base_C): New macro definition.
Diffstat (limited to 'finalize.c')
-rw-r--r-- | finalize.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -137,7 +137,7 @@ GC_API int GC_CALL GC_register_disappearing_link(void * * link) { ptr_t base; - base = (ptr_t)GC_base((void *)link); + base = (ptr_t)GC_base(link); if (base == 0) ABORT("Bad arg to GC_register_disappearing_link"); return(GC_general_register_disappearing_link(link, base)); @@ -154,7 +154,7 @@ GC_API int GC_CALL GC_general_register_disappearing_link(void * * link, if (((word)link & (ALIGNMENT-1)) || link == NULL) ABORT("Bad arg to GC_general_register_disappearing_link"); LOCK(); - GC_ASSERT(obj != NULL && GC_base((void *)obj) == obj); + GC_ASSERT(obj != NULL && GC_base_C(obj) == obj); if (log_dl_table_size == -1 || GC_dl_entries > ((word)1 << log_dl_table_size)) { GC_grow_table((struct hash_chain_entry ***)(&dl_head), @@ -664,7 +664,7 @@ GC_INNER void GC_finalize(void) GC_bytes_finalized += curr_fo -> fo_object_size + sizeof(struct finalizable_object); - GC_ASSERT(GC_is_marked(GC_base((ptr_t)curr_fo))); + GC_ASSERT(GC_is_marked(GC_base(curr_fo))); curr_fo = next_fo; } else { prev_fo = curr_fo; |