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

Farious fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29513 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-08 17:52:36 +00:00
parent dfdd5d3483
commit 29b9911e0d
6 changed files with 150 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/GSString.m
View file

@ -831,11 +831,11 @@ fixBOM(unsigned char **bytes, NSUInteger*length, BOOL *owned,
if (string == nil)
[NSException raise: NSInvalidArgumentException
format: @"-initWithString: given nil string"];
c = GSObjCClass(string);
if (GSObjCIsKindOf(c, NSStringClass) == NO)
if (NO == [string isKindOfClass: NSStringClass]) // may be proxy
[NSException raise: NSInvalidArgumentException
format: @"-initWithString: given non-string object"];
c = GSObjCClass(string);
length = [string length];
if (GSObjCIsKindOf(c, GSCStringClass) == YES || c == NSConstantStringClass
|| (GSObjCIsKindOf(c, GSMutableStringClass) == YES
@ -2144,7 +2144,7 @@ isEqual_c(GSStr self, id anObject)
}
return NO;
}
else if (GSObjCIsKindOf(c, NSStringClass))
else if (YES == [anObject isKindOfClass: NSStringClass]) // may be proxy
{
return (*equalImp)((id)self, equalSel, anObject);
}
@ -2211,7 +2211,7 @@ isEqual_u(GSStr self, id anObject)
}
return NO;
}
else if (GSObjCIsKindOf(c, NSStringClass))
else if (YES == [anObject isKindOfClass: NSStringClass]) // may be proxy
{
return (*equalImp)((id)self, equalSel, anObject);
}
@ -4767,7 +4767,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
}
return NO;
}
else if (GSObjCIsKindOf(c, NSStringClass))
else if (YES == [anObject isKindOfClass: NSStringClass]) // may be proxy
{
return (*equalImp)(self, equalSel, anObject);
}
@ -4817,7 +4817,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
}
return NO;
}
else if (GSObjCIsKindOf(c, NSStringClass))
else if (YES == [anObject isKindOfClass: NSStringClass]) // may be proxy
{
return (*equalImp)(self, equalSel, anObject);
}