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

Fix the build on platforms without tiny string support.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35447 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2012-08-25 12:31:41 +00:00
parent ccaefa05e8
commit dceedfb915
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Source/GSString.m
View file

@ -867,6 +867,12 @@ createTinyString(const char *str, int length)
__sync_fetch_and_add(&tinyStrings, 1); __sync_fetch_and_add(&tinyStrings, 1);
return (id)s; return (id)s;
} }
#else
static id
createTinyString(const char *str, int length)
{
return nil;
}
#endif #endif
/* /*
* The GSPlaceholderString class is used by the abstract cluster root * The GSPlaceholderString class is used by the abstract cluster root
@ -3740,7 +3746,7 @@ agree, create a new GSCInlineString otherwise.
- (NSString*) substringFromRange: (NSRange)aRange - (NSString*) substringFromRange: (NSRange)aRange
{ {
if (useTinyStrings && !_flags.wide) if (!_flags.wide)
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
@ -3764,7 +3770,7 @@ agree, create a new GSCInlineString otherwise.
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
return substring_c((GSStr)self, aRange); return substring_c((GSStr)self, aRange);
} }
if (useTinyStrings && !_flags.wide) if (!_flags.wide)
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
@ -4075,7 +4081,7 @@ agree, create a new GSCInlineString otherwise.
- (NSString*) substringFromRange: (NSRange)aRange - (NSString*) substringFromRange: (NSRange)aRange
{ {
if (useTinyStrings && !_flags.wide) if (!_flags.wide)
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
@ -4094,7 +4100,7 @@ agree, create a new GSCInlineString otherwise.
- (NSString*) substringWithRange: (NSRange)aRange - (NSString*) substringWithRange: (NSRange)aRange
{ {
if (useTinyStrings && !_flags.wide) if (!_flags.wide)
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
@ -5107,7 +5113,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
aRange.length * sizeof(unichar)); aRange.length * sizeof(unichar));
return o; return o;
} }
else if (useTinyStrings) else
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);
@ -5142,7 +5148,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
aRange.length * sizeof(unichar)); aRange.length * sizeof(unichar));
return o; return o;
} }
else if (useTinyStrings) else
{ {
id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length); id tinyString = createTinyString((char*)_contents.c + aRange.location, aRange.length);