From 18e20a6b22f2d7855c4e8b774030f223819b1319 Mon Sep 17 00:00:00 2001 From: pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Wed, 2 Mar 2005 19:37:03 +0000 Subject: 2005-03-02 David Ayers <d.ayers@inode.at> PR libobjc/19024 * Makefile.in (OBJS): Add hash_compat.lo. (OBJS_GC): Add hash_compat_gc.lo. (hash_compat_gc.lo): New target and rule. * objc/hash.h (hash_new, hash_delete, hash_add, hash_remove) (hash_next, hash_value_for_key, hash_is_key_in_hash) (hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix with objc_. Add deprecated non prefixed inlined versions. (OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated declarations. * hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next) (hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and update callers. * hash_compat.c: New file. * archive.c: Update callers. * init.c: Likewise. * selector.c: Likewise. * libobjc.def: Add objc_ versions of hash functions. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95793 138bc75d-0d04-0410-961f-82ee72b054a4 --- libobjc/selector.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libobjc/selector.c') diff --git a/libobjc/selector.c b/libobjc/selector.c index edaef2d959d..ce8acf7ac3a 100644 --- a/libobjc/selector.c +++ b/libobjc/selector.c @@ -43,9 +43,9 @@ void __objc_init_selector_tables (void) __objc_selector_array = sarray_new (SELECTOR_HASH_SIZE, 0); __objc_selector_names = sarray_new (SELECTOR_HASH_SIZE, 0); __objc_selector_hash - = hash_new (SELECTOR_HASH_SIZE, - (hash_func_type) hash_string, - (compare_func_type) compare_strings); + = objc_hash_new (SELECTOR_HASH_SIZE, + (hash_func_type) objc_hash_string, + (compare_func_type) objc_compare_strings); } /* This routine is given a class and records all of the methods in its class @@ -195,7 +195,7 @@ sel_get_typed_uid (const char *name, const char *types) objc_mutex_lock (__objc_runtime_mutex); - i = (sidx) hash_value_for_key (__objc_selector_hash, name); + i = (sidx) objc_hash_value_for_key (__objc_selector_hash, name); if (i == 0) { objc_mutex_unlock (__objc_runtime_mutex); @@ -235,7 +235,7 @@ sel_get_any_typed_uid (const char *name) objc_mutex_lock (__objc_runtime_mutex); - i = (sidx) hash_value_for_key (__objc_selector_hash, name); + i = (sidx) objc_hash_value_for_key (__objc_selector_hash, name); if (i == 0) { objc_mutex_unlock (__objc_runtime_mutex); @@ -266,7 +266,7 @@ sel_get_any_uid (const char *name) objc_mutex_lock (__objc_runtime_mutex); - i = (sidx) hash_value_for_key (__objc_selector_hash, name); + i = (sidx) objc_hash_value_for_key (__objc_selector_hash, name); if (soffset_decode (i) == 0) { objc_mutex_unlock (__objc_runtime_mutex); @@ -368,7 +368,7 @@ __sel_register_typed_name (const char *name, const char *types, sidx i; struct objc_list *l; - i = (sidx) hash_value_for_key (__objc_selector_hash, name); + i = (sidx) objc_hash_value_for_key (__objc_selector_hash, name); if (soffset_decode (i) != 0) { for (l = (struct objc_list *) sarray_get_safe (__objc_selector_array, i); @@ -453,7 +453,7 @@ __sel_register_typed_name (const char *name, const char *types, sarray_at_put_safe (__objc_selector_names, i, (void *) new_name); sarray_at_put_safe (__objc_selector_array, i, (void *) l); if (is_new) - hash_add (&__objc_selector_hash, (void *) new_name, (void *) i); + objc_hash_add (&__objc_selector_hash, (void *) new_name, (void *) i); } sarray_realloc (__objc_uninstalled_dtable, __objc_selector_max_index + 1); -- cgit v1.2.1