X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libobjc%2FObject.m;h=552acb037fac571518154dfeda76f764731ad67b;hb=0b81f26c304d304e6a239e04408de47e02c8625b;hp=9781fad1d7fc8d95eda85087753f2ea59d4fe11b;hpb=dd3dba526f93ec79a1998a9c1845833087d0b134;p=gcc.git

diff --git a/libobjc/Object.m b/libobjc/Object.m
index 9781fad1d7f..552acb037fa 100644
--- a/libobjc/Object.m
+++ b/libobjc/Object.m
@@ -24,18 +24,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
 #include "objc-private/common.h"
-#include <stdarg.h>
-#include <string.h> /* For strcmp.  */
-#include <errno.h>
 #include "objc/Object.h"
-#include "objc/Protocol.h"
-#include "objc/objc-api.h"
+#include "objc/runtime.h"
 
 @implementation Object
 
 - (Class)class
 {
-  return object_get_class (self);
+  return object_getClass (self);
 }
 
 - (BOOL)isEqual: (id)anObject
@@ -44,244 +40,3 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 }
 
 @end
-
-/* The following methods were deprecated in GCC 4.6.0 and will be
-   removed in the next GCC release.  */
-@implementation Object (Deprecated)
-
-+ initialize
-{
-  return self;
-}
-
-- init
-{
-  return self;
-}
-
-+ new
-{
-  return [[self alloc] init];
-}
-
-+ alloc
-{
-  return class_create_instance(self);
-}
-
-- free
-{
-  return object_dispose(self);
-}
-
-- copy
-{
-  return [[self shallowCopy] deepen];
-}
-
-- shallowCopy
-{
-  return object_copy(self);
-}
-
-- deepen
-{
-  return self;
-}
-
-- deepCopy
-{
-  return [self copy];
-}
-
-- (Class)superClass
-{
-  return object_get_super_class(self);
-}
-
-- (MetaClass)metaClass
-{
-  return object_get_meta_class(self);
-}
-
-- (const char *)name
-{
-  return object_get_class_name(self);
-}
-
-- self
-{
-  return self;
-}
-
-- (unsigned int)hash
-{
-  return (size_t)self;
-}
-
-- (int)compare:(id)anotherObject;
-{
-  if ([self isEqual:anotherObject])
-    return 0;
-  // Ordering objects by their address is pretty useless, 
-  // so subclasses should override this is some useful way.
-  else if ((id)self > anotherObject)
-    return 1;
-  else 
-    return -1;
-}
-
-- (BOOL)isMetaClass
-{
-  return NO;
-}
-
-- (BOOL)isClass
-{
-  return object_is_class(self);
-}
-
-- (BOOL)isInstance
-{
-  return object_is_instance(self);
-}
-
-- (BOOL)isKindOf:(Class)aClassObject
-{
-  Class class;
-
-  for (class = self->isa; class!=Nil; class = class_get_super_class(class))
-    if (class==aClassObject)
-      return YES;
-  return NO;
-}
-
-- (BOOL)isMemberOf:(Class)aClassObject
-{
-  return self->isa==aClassObject;
-}
-
-- (BOOL)isKindOfClassNamed:(const char *)aClassName
-{
-  Class class;
-
-  if (aClassName!=NULL)
-    for (class = self->isa; class!=Nil; class = class_get_super_class(class))
-      if (!strcmp(class_get_class_name(class), aClassName))
-        return YES;
-  return NO;
-}
-
-- (BOOL)isMemberOfClassNamed:(const char *)aClassName
-{
-  return ((aClassName!=NULL)
-          &&!strcmp(class_get_class_name(self->isa), aClassName));
-}
-
-+ (BOOL)instancesRespondTo:(SEL)aSel
-{
-  return class_get_instance_method(self, aSel) != (Method_t)0;
-}
-
-- (BOOL)respondsTo:(SEL)aSel
-{
-  return ((object_is_instance(self)
-           ?class_get_instance_method(self->isa, aSel)
-           :class_get_class_method(self->isa, aSel)) != (Method_t)0);
-}
-
-+ (IMP)instanceMethodFor:(SEL)aSel
-{
-  return method_get_imp(class_get_instance_method(self, aSel));
-}
-
-// Indicates if the receiving class or instance conforms to the given protocol
-// not usually overridden by subclasses
-//
-// Modified 9/5/94 to always search the class object's protocol list, rather
-// than the meta class.
-
-+ (BOOL) conformsTo: (Protocol*)aProtocol
-{
-  size_t i;
-  struct objc_protocol_list* proto_list;
-  id parent;
-
-  for (proto_list = ((Class)self)->protocols;
-       proto_list; proto_list = proto_list->next)
-    {
-      for (i=0; i < proto_list->count; i++)
-      {
-        if ([proto_list->list[i] conformsTo: aProtocol])
-          return YES;
-      }
-    }
-
-  if ((parent = [self superClass]))
-    return [parent conformsTo: aProtocol];
-  else
-    return NO;
-}
-
-- (BOOL) conformsTo: (Protocol*)aProtocol
-{
-  return [[self class] conformsTo:aProtocol];
-}
-
-- (IMP)methodFor:(SEL)aSel
-{
-  return (method_get_imp(object_is_instance(self)
-                         ?class_get_instance_method(self->isa, aSel)
-                         :class_get_class_method(self->isa, aSel)));
-}
-
-+ (struct objc_method_description *)descriptionForInstanceMethod:(SEL)aSel
-{
-  return ((struct objc_method_description *)
-           class_get_instance_method(self, aSel));
-}
-
-- (struct objc_method_description *)descriptionForMethod:(SEL)aSel
-{
-  return ((struct objc_method_description *)
-           (object_is_instance(self)
-            ?class_get_instance_method(self->isa, aSel)
-            :class_get_class_method(self->isa, aSel)));
-}
-
-- (retval_t)performv:(SEL)aSel :(arglist_t)argFrame
-{
-  return objc_msg_sendv(self, aSel, argFrame);
-}
-
-+ poseAs:(Class)aClassObject
-{
-  return class_pose_as(self, aClassObject);
-}
-
-- (Class)transmuteClassTo:(Class)aClassObject
-{
-  if (object_is_instance(self))
-    if (class_is_class(aClassObject))
-      if (class_get_instance_size(aClassObject)==class_get_instance_size(isa))
-        if ([self isKindOf:aClassObject])
-          {
-            Class old_isa = isa;
-            isa = aClassObject;
-            return old_isa;
-          }
-  return nil;
-}
-
-+ (int)version
-{
-  return class_get_version(self);
-}
-
-+ setVersion:(int)aVersion
-{
-  class_set_version(self, aVersion);
-  return self;
-}
-
-@end