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

Explicitly use 'int' to read/write NSStringEncoding so that

Browse source 
it works for all versions of GCC


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31784 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2010-12-27 11:28:01 +00:00
parent b4d407b26e
commit 5dd72905c8
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/GSString.m
View file

@ -3144,7 +3144,7 @@ transmute(GSStr self, NSString *aString)
[aCoder encodeValueOfObjCType: @encode(unsigned) at: &_count];
if (_count > 0)
{
[aCoder encodeValueOfObjCType: @encode(NSStringEncoding)
[aCoder encodeValueOfObjCType: @encode(int)
at: &internalEncoding];
[aCoder encodeArrayOfObjCType: @encode(unsigned char)
count: _count
@ -3461,7 +3461,7 @@ agree, create a new GSCInlineString otherwise.
{
NSStringEncoding enc = NSUnicodeStringEncoding;
[aCoder encodeValueOfObjCType: @encode(NSStringEncoding) at: &enc];
[aCoder encodeValueOfObjCType: @encode(int) at: &enc];
[aCoder encodeArrayOfObjCType: @encode(unichar)
count: _count
at: _contents.u];
@ -3920,14 +3920,14 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
{
NSStringEncoding enc = NSUnicodeStringEncoding;
[aCoder encodeValueOfObjCType: @encode(NSStringEncoding) at: &enc];
[aCoder encodeValueOfObjCType: @encode(int) at: &enc];
[aCoder encodeArrayOfObjCType: @encode(unichar)
count: _count
at: _contents.u];
}
else
{
[aCoder encodeValueOfObjCType: @encode(NSStringEncoding)
[aCoder encodeValueOfObjCType: @encode(int)
at: &internalEncoding];
[aCoder encodeArrayOfObjCType: @encode(unsigned char)
count: _count