* src/NSData.m ([NSData +allocWithZone:]): New method.

([NSMutableData +allocWithZone:]): Likewise.
	([NSData +data, +dataWithBytes:length:,
	+dataWithBytesNoCopy:length:, +dataWithContentsOfFile:,
	+dataWithContentsOfMappedFile:]): Allocate using designated
	allocator.  ([NSMutableData +dataWithCapacity:,
	+dataWithLength:]): Likewise.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@575 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew McCallum 1995-08-23 15:36:59 +00:00
parent 805d7d9c0f
commit 46f15290d6

View file

@ -61,25 +61,28 @@ static Class NSMutableData_concrete_class;
} }
// Allocating and Initializing a Data Object // Allocating and Initializing a Data Object
+ allocWithZone:(NSZone *)zone
{
return NSAllocateObject([self _concreteClass], 0, zone);
}
+ (id) data + (id) data
{ {
return [[[[self _concreteClass] alloc] init] return [[[self alloc] init]
autorelease]; autorelease];
} }
+ (id) dataWithBytes: (const void*)bytes + (id) dataWithBytes: (const void*)bytes
length: (unsigned int)length length: (unsigned int)length
{ {
return [[[[self _concreteClass] alloc] initWithBytes:bytes length:length] return [[[self alloc] initWithBytes:bytes length:length]
autorelease]; autorelease];
} }
+ (id) dataWithBytesNoCopy: (void*)bytes + (id) dataWithBytesNoCopy: (void*)bytes
length: (unsigned int)length length: (unsigned int)length
{ {
return [[[[self _concreteClass] alloc] return [[[self alloc] initWithBytesNoCopy:bytes length:length]
initWithBytesNoCopy:bytes length:length]
autorelease]; autorelease];
} }
@ -88,13 +91,13 @@ static Class NSMutableData_concrete_class;
* though. */ * though. */
+ (id)dataWithContentsOfFile: (NSString*)path + (id)dataWithContentsOfFile: (NSString*)path
{ {
return [[[[self _concreteClass] alloc] initWithContentsOfFile:path] return [[[self alloc] initWithContentsOfFile:path]
autorelease]; autorelease];
} }
+ (id) dataWithContentsOfMappedFile: (NSString*)path + (id) dataWithContentsOfMappedFile: (NSString*)path
{ {
return [[[[self _concreteClass] alloc] initWithContentsOfMappedFile:path] return [[[self alloc] initWithContentsOfMappedFile:path]
autorelease]; autorelease];
} }
@ -473,16 +476,20 @@ static Class NSMutableData_concrete_class;
@implementation NSMutableData @implementation NSMutableData
+ allocWithZone:(NSZone *)zone
{
return NSAllocateObject([self _mutableConcreteClass], 0, zone);
}
+ (id) dataWithCapacity: (unsigned int)numBytes + (id) dataWithCapacity: (unsigned int)numBytes
{ {
return [[[[[self _mutableConcreteClass] class] alloc] return [[[self alloc] initWithCapacity:numBytes]
initWithCapacity:numBytes]
autorelease]; autorelease];
} }
+ (id) dataWithLength: (unsigned int)length + (id) dataWithLength: (unsigned int)length
{ {
return [[[[[self _mutableConcreteClass] class] alloc] initWithLength:length] return [[[self alloc] initWithLength:length]
autorelease]; autorelease];
} }