From 8f4c11831762b94f622334c8d40ddb9c17b66f1a Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 4 Aug 1998 12:04:04 +0000 Subject: [PATCH] Merged into NSObject.m git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2900 72102866-910b-0410-8b05-ffd578937521 --- Source/NSAllocateObject.m | 44 ------------------------------------- Source/NSDeallocateObject.m | 39 -------------------------------- 2 files changed, 83 deletions(-) delete mode 100644 Source/NSAllocateObject.m delete mode 100644 Source/NSDeallocateObject.m diff --git a/Source/NSAllocateObject.m b/Source/NSAllocateObject.m deleted file mode 100644 index 0071de09a..000000000 --- a/Source/NSAllocateObject.m +++ /dev/null @@ -1,44 +0,0 @@ -/* Implementation of NSAllocateObject() for GNUStep - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. - - Written by: Andrew Kachites McCallum - Date: August 1994 - - This file is part of the GNUstep Base Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include - -#include /* For memset(). */ - -NSObject *NSAllocateObject (Class aClass, unsigned extraBytes, NSZone *zone) -{ - id new = nil; - int size = aClass->instance_size + extraBytes; - if (CLS_ISCLASS (aClass)) - new = NSZoneMalloc (zone, size); - if (new != nil) - { - memset (new, 0, size); - new->class_pointer = aClass; - } - GSDebugAllocationAdd(aClass); - return new; -} - diff --git a/Source/NSDeallocateObject.m b/Source/NSDeallocateObject.m deleted file mode 100644 index f6fdba777..000000000 --- a/Source/NSDeallocateObject.m +++ /dev/null @@ -1,39 +0,0 @@ -/* Implementation of NSDeallocateObject() for GNUStep - Copyright (C) 1994, 1995 Free Software Foundation, Inc. - - Written by: Andrew Kachites McCallum - Date: August 1994 - - This file is part of the GNUstep Base Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include - -#include - -void NSDeallocateObject(NSObject *anObject) -{ - if ((anObject!=nil) && CLS_ISCLASS(((id)anObject)->class_pointer)) - { - NSZone *z = [anObject zone]; - GSDebugAllocationRemove(((id)anObject)->class_pointer); - ((id)anObject)->class_pointer = (void*) 0xdeadface; - NSZoneFree (z, anObject); - } - return; -}