+2005-11-20 David Ayers <d.ayers@inode.at>
+
+ 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.
+
2005-11-09 Alexandre Oliva <aoliva@redhat.com>
PR other/4372
OBJS = archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo \
misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo \
Protocol.lo sarray.lo selector.lo sendmsg.lo thr.lo \
- $(OBJC_THREAD_FILE).lo exception.lo hash_compat.lo
+ $(OBJC_THREAD_FILE).lo exception.lo
OBJS_GC = archive_gc.lo class_gc.lo encoding_gc.lo gc_gc.lo hash_gc.lo \
init_gc.lo linking_gc.lo misc_gc.lo nil_method_gc.lo \
NXConstStr_gc.lo Object_gc.lo objects_gc.lo Protocol_gc.lo \
sarray_gc.lo selector_gc.lo sendmsg_gc.lo thr_gc.lo \
- $(OBJC_THREAD_FILE)_gc.lo exception_gc.lo hash_compat_gc.lo
+ $(OBJC_THREAD_FILE)_gc.lo exception_gc.lo
runtime-info.h:
echo "" > tmp-runtime.m
$(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
$(INCLUDES) $<
-hash_compat_gc.lo: hash_compat.c
- $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
- $(INCLUDES) $<
-
init_gc.lo: init.c
$(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
$(INCLUDES) $<
# We need the following definitions because AC_PROG_LIBTOOL relies on them
PACKAGE=libobjc
# Version is pulled out to make it a bit easier to change using sed.
-VERSION=1:0:0
+VERSION=2:0:0
# This works around the fact that libtool configuration may change LD
# We need the following definitions because AC_PROG_LIBTOOL relies on them
PACKAGE=libobjc
# Version is pulled out to make it a bit easier to change using sed.
-VERSION=1:0:0
+VERSION=2:0:0
AC_SUBST(VERSION)
# This works around the fact that libtool configuration may change LD
+++ /dev/null
-/* Binary compatibility hash implementations for Objective C.
- Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
-
-/* As a special exception, if you link this library with files
- compiled with GCC to produce an executable, this does not cause
- the resulting executable to be covered by the GNU General Public License.
- This exception does not however invalidate any other reasons why
- the executable file might be covered by the GNU General Public License. */
-
-#define OBJC_IGNORE_DEPRECATED_API 1
-#include "objc/hash.h"
-
-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);
-}
-
-void
-hash_delete(cache_ptr cache)
-{
- objc_hash_delete(cache);
-}
-
-void
-hash_add (cache_ptr *cachep, const void *key, void *value)
-{
- objc_hash_add(cachep, key, value);
-}
-
-void
-hash_remove (cache_ptr cache, const void *key)
-{
- objc_hash_remove (cache, key);
-}
-
-node_ptr
-hash_next (cache_ptr cache, node_ptr node)
-{
- return objc_hash_next (cache, node);
-}
-
-void *
-hash_value_for_key (cache_ptr cache, const void *key)
-{
- return objc_hash_value_for_key (cache, key);
-}
-
-BOOL
-hash_is_key_in_hash (cache_ptr cache, const void *key)
-{
- return objc_hash_is_key_in_hash (cache, key);
-}
-
-unsigned int
-hash_ptr (cache_ptr cache, const void *key)
-{
- return objc_hash_ptr (cache, key);
-}
-
-unsigned int
-hash_string (cache_ptr cache, const void *key)
-{
- return objc_hash_string (cache, key);
-}
-
-int
-compare_ptrs (const void *k1, const void *k2)
-{
- return objc_compare_ptrs (k1, k2);
-}
-
-int
-compare_strings (const void *k1, const void *k2)
-{
- return objc_compare_strings (k1, 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
}
OSDN Git Service
