From 815d63dd46f8abae72087ecefcd03af09c8559cc Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Fri, 3 Jun 2011 19:43:04 +0000 Subject: [PATCH] In libobjc/: 2011-06-03 Nicola Pero In libobjc/: 2011-06-03 Nicola Pero * Makefile.in (OBJC_DEPRECATED_H): Removed objc_object_alloc.h. * objc/deprecated/objc_object_alloc.h: Removed. * objc/objc-api.h: Do not include deprecated/objc_object_alloc.h. * objects.c (_objc_object_alloc, _objc_object_dispose, _objc_object_copy): Removed. * libobjc.def (__objc_object_alloc, __objc_object_copy, __objc_object_dispose): Removed. From-SVN: r174617 --- libobjc/ChangeLog | 10 ++++++++++ libobjc/Makefile.in | 1 - libobjc/libobjc.def | 3 --- libobjc/objc/deprecated/objc_object_alloc.h | 8 -------- libobjc/objc/objc-api.h | 2 -- libobjc/objects.c | 5 ----- 6 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 libobjc/objc/deprecated/objc_object_alloc.h diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b53796d2606..7ebea349cec 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,13 @@ +2011-06-03 Nicola Pero + + * Makefile.in (OBJC_DEPRECATED_H): Removed objc_object_alloc.h. + * objc/deprecated/objc_object_alloc.h: Removed. + * objc/objc-api.h: Do not include deprecated/objc_object_alloc.h. + * objects.c (_objc_object_alloc, _objc_object_dispose, + _objc_object_copy): Removed. + * libobjc.def (__objc_object_alloc, __objc_object_copy, + __objc_object_dispose): Removed. + 2011-06-03 Nicola Pero * Makefile.in (OBJC_DEPRECATED_H): Removed METHOD_NULL.h. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 8601653a57a..71a974171e0 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -132,7 +132,6 @@ OBJC_DEPRECATED_H = \ Protocol.h \ objc_get_uninstalled_dtable.h \ objc_msg_sendv.h \ - objc_object_alloc.h \ struct_objc_category.h \ struct_objc_class.h \ struct_objc_ivar.h \ diff --git a/libobjc/libobjc.def b/libobjc/libobjc.def index b825e4e3831..8a295c824f7 100644 --- a/libobjc/libobjc.def +++ b/libobjc/libobjc.def @@ -48,9 +48,6 @@ objc_thread_remove __objc_class_name_Object __objc_class_name_Protocol __objc_class_name_NXConstantString -__objc_object_alloc -__objc_object_copy -__objc_object_dispose class_create_instance object_copy object_dispose diff --git a/libobjc/objc/deprecated/objc_object_alloc.h b/libobjc/objc/deprecated/objc_object_alloc.h deleted file mode 100644 index f6336ca8efa..00000000000 --- a/libobjc/objc/deprecated/objc_object_alloc.h +++ /dev/null @@ -1,8 +0,0 @@ -/* These functions are deprecated and currently ignored. */ -/* -** Hook functions for allocating, copying and disposing of instances -*/ -objc_EXPORT id (*_objc_object_alloc)(Class _class); -objc_EXPORT id (*_objc_object_copy)(id object); -objc_EXPORT id (*_objc_object_dispose)(id object); - diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h index 10a0e6194c1..bda614f6573 100644 --- a/libobjc/objc/objc-api.h +++ b/libobjc/objc/objc-api.h @@ -191,8 +191,6 @@ objc_EXPORT Class (*_objc_lookup_class)(const char *name); */ objc_EXPORT void (*_objc_load_callback)(Class _class, Category* category); -#include "deprecated/objc_object_alloc.h" - /* Standard functions for memory allocation and disposal. Users should use these functions in their ObjC programs so that they work so that diff --git a/libobjc/objects.c b/libobjc/objects.c index 1c69456a630..bcfb25bd604 100644 --- a/libobjc/objects.c +++ b/libobjc/objects.c @@ -123,8 +123,3 @@ object_setClass (id object, Class class_) } } -/* Hook functions for memory allocation and disposal. Deprecated and - currently unused. */ -id (*_objc_object_alloc) (Class) = 0; -id (*_objc_object_dispose) (id) = 0; -id (*_objc_object_copy) (id) = 0;