gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-11 00:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

add new coding version for 64bit

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29980 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-03-16 13:03:36 +00:00
parent d435122451
commit cef862d077
1 changed files with 76 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
Source/NSValue.m
View file

@ -88,7 +88,7 @@ static NSLock *placeholderLock;
if (self == [NSValue class]) if (self == [NSValue class])
{ {
abstractClass = self; abstractClass = self;
[abstractClass setVersion: 2]; // Version 2 [abstractClass setVersion: 3]; // Version 3
concreteClass = [GSValue class]; concreteClass = [GSValue class];
nonretainedObjectValueClass = [GSNonretainedObjectValue class]; nonretainedObjectValueClass = [GSNonretainedObjectValue class];
pointValueClass = [GSPointValue class]; pointValueClass = [GSPointValue class];
@ -390,6 +390,35 @@ static NSLock *placeholderLock;
size = strlen(objctype)+1; size = strlen(objctype)+1;
[coder encodeValueOfObjCType: @encode(unsigned) at: &size]; [coder encodeValueOfObjCType: @encode(unsigned) at: &size];
[coder encodeArrayOfObjCType: @encode(signed char) count: size at: objctype]; [coder encodeArrayOfObjCType: @encode(signed char) count: size at: objctype];
if (strncmp("{_NSSize=", objctype, 9) == 0)
{
NSSize v = [self sizeValue];
[coder encodeValueOfObjCType: objctype at: &v];
return;
}
else if (strncmp("{_NSPoint=", objctype, 10) == 0)
{
NSPoint v = [self pointValue];
[coder encodeValueOfObjCType: objctype at: &v];
return;
}
else if (strncmp("{_NSRect=", objctype, 9) == 0)
{
NSRect v = [self rectValue];
[coder encodeValueOfObjCType: objctype at: &v];
return;
}
else if (strncmp("{_NSRange=", objctype, 10) == 0)
{
NSRange v = [self rangeValue];
[coder encodeValueOfObjCType: objctype at: &v];
return;
}
size = objc_sizeof_type(objctype); size = objc_sizeof_type(objctype);
data = (void *)NSZoneMalloc([self zone], size); data = (void *)NSZoneMalloc([self zone], size);
[self getValue: (void*)data]; [self getValue: (void*)data];
@ -429,10 +458,55 @@ static NSLock *placeholderLock;
[coder decodeArrayOfObjCType: @encode(signed char) [coder decodeArrayOfObjCType: @encode(signed char)
count: size count: size
at: (void*)objctype]; at: (void*)objctype];
c = [abstractClass valueClassWithObjCType: objctype]; if (strncmp("{_NSSize=", objctype, 9) == 0)
c = [abstractClass valueClassWithObjCType: @encode(NSSize)];
else if (strncmp("{_NSPoint=", objctype, 10) == 0)
c = [abstractClass valueClassWithObjCType: @encode(NSPoint)];
else if (strncmp("{_NSRect=", objctype, 9) == 0)
c = [abstractClass valueClassWithObjCType: @encode(NSRect)];
else if (strncmp("{_NSRange=", objctype, 10) == 0)
c = [abstractClass valueClassWithObjCType: @encode(NSRange)];
else
c = [abstractClass valueClassWithObjCType: objctype];
o = [c allocWithZone: [coder objectZone]]; o = [c allocWithZone: [coder objectZone]];
ver = [coder versionForClassName: @"NSValue"]; ver = [coder versionForClassName: @"NSValue"];
if (ver > 2)
{
if (c == pointValueClass)
{
NSPoint v;
[coder decodeValueOfObjCType: @encode(NSPoint) at: &v];
DESTROY(self);
return [o initWithBytes: &v objCType: @encode(NSPoint)];
}
else if (c == sizeValueClass)
{
NSSize v;
[coder decodeValueOfObjCType: @encode(NSSize) at: &v];
DESTROY(self);
return [o initWithBytes: &v objCType: @encode(NSSize)];
}
else if (c == rangeValueClass)
{
NSRange v;
[coder decodeValueOfObjCType: @encode(NSRange) at: &v];
DESTROY(self);
return [o initWithBytes: &v objCType: @encode(NSRange)];
}
else if (c == rectValueClass)
{
NSRect v;
[coder decodeValueOfObjCType: @encode(NSRect) at: &v];
DESTROY(self);
return [o initWithBytes: &v objCType: @encode(NSRect)];
}
}
if (ver < 2) if (ver < 2)
{ {
if (ver < 1) if (ver < 1)