From 8470034667a3a38655d0090223d03a1f2e731492 Mon Sep 17 00:00:00 2001 From: David Ayers Date: Sun, 20 Nov 2005 13:49:41 +0100 Subject: re PR libobjc/19024 (name collisions libobjc/libmysqlclient) 2005-11-20 David Ayers PR libobjc/19024 * objc/hash.h: Remove deprecated hash API. * hash_compat.c: Remove. * Makefile.in: Remove reference to hash_compat.c. * configure.ac (VERSION): Bump library version to 2:0:0. * configure: Regenerate. From-SVN: r107251 --- libobjc/objc/hash.h | 100 ---------------------------------------------------- 1 file changed, 100 deletions(-) (limited to 'libobjc/objc') diff --git a/libobjc/objc/hash.h b/libobjc/objc/hash.h index 2260fad..b1cdd0c 100644 --- a/libobjc/objc/hash.h +++ b/libobjc/objc/hash.h @@ -207,106 +207,6 @@ objc_compare_strings (const void *k1, const void *k2) return ! strcmp ((const char *) k1, (const char *) k2); } -#ifndef OBJC_IGNORE_DEPRECATED_API -/* Deprecated as of 4.0 */ - -static inline cache_ptr -hash_new (unsigned int size, - hash_func_type hash_func, - compare_func_type compare_func) __attribute__ ((deprecated)); -static inline cache_ptr -hash_new (unsigned int size, - hash_func_type hash_func, - compare_func_type compare_func) -{ - return objc_hash_new(size, hash_func, compare_func); -} - -static inline void -hash_delete(cache_ptr cache) __attribute__ ((deprecated)); -static inline void -hash_delete(cache_ptr cache) -{ - objc_hash_delete(cache); -} - -static inline void -hash_add (cache_ptr *cachep, - const void *key, - void *value) __attribute__ ((deprecated)); -static inline void -hash_add (cache_ptr *cachep, const void *key, void *value) -{ - objc_hash_add(cachep, key, value); -} - -static inline void -hash_remove (cache_ptr cache, const void *key) __attribute__ ((deprecated)); -static inline void -hash_remove (cache_ptr cache, const void *key) -{ - objc_hash_remove (cache, key); -} - -static inline node_ptr -hash_next (cache_ptr cache, node_ptr node) __attribute__ ((deprecated)); -static inline node_ptr -hash_next (cache_ptr cache, node_ptr node) -{ - return objc_hash_next (cache, node); -} - -static inline void * -hash_value_for_key (cache_ptr cache, - const void *key) __attribute__ ((deprecated)); -static inline void * -hash_value_for_key (cache_ptr cache, const void *key) -{ - return objc_hash_value_for_key (cache, key); -} - -static inline BOOL -hash_is_key_in_hash (cache_ptr cache, - const void *key) __attribute__ ((deprecated)); -static inline BOOL -hash_is_key_in_hash (cache_ptr cache, const void *key) -{ - return objc_hash_is_key_in_hash (cache, key); -} - -static inline unsigned int -hash_ptr (cache_ptr cache, const void *key) __attribute__ ((deprecated)); -static inline unsigned int -hash_ptr (cache_ptr cache, const void *key) -{ - return objc_hash_ptr (cache, key); -} - -static inline unsigned int -hash_string (cache_ptr cache, const void *key) __attribute__ ((deprecated)); -static inline unsigned int -hash_string (cache_ptr cache, const void *key) -{ - return objc_hash_string (cache, key); -} - -static inline int -compare_ptrs (const void *k1, const void *k2) __attribute__ ((deprecated)); -static inline int -compare_ptrs (const void *k1, const void *k2) -{ - return objc_compare_ptrs (k1, k2); -} - -static inline int -compare_strings (const void *k1, const void *k2) __attribute__ ((deprecated)); -static inline int -compare_strings (const void *k1, const void *k2) -{ - return objc_compare_strings (k1, k2); -} -#endif /* OBJC_IGNORE_DEPRECATED_API */ - #ifdef __cplusplus } -- cgit v1.1