gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compile fix.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31935 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
stefanbidi 2011-01-23 18:25:56 +00:00
parent f9107cb189
commit 179449dcc0
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Headers/Foundation/NSDateFormatter.h
View file

@ -130,6 +130,7 @@ typedef NSUInteger NSDateFormatterBehavior;
NSUInteger _behavior; NSUInteger _behavior;
NSLocale *_locale; NSLocale *_locale;
NSTimeZone *_tz; NSTimeZone *_tz;
NSCalendar *_calendar;
NSDateFormatterStyle _timeStyle; NSDateFormatterStyle _timeStyle;
NSDateFormatterStyle _dateStyle; NSDateFormatterStyle _dateStyle;
void *_formatter; void *_formatter;

11
Source/NSDateFormatter.m
View file

@ -87,6 +87,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
_behavior = _defaultBehavior; _behavior = _defaultBehavior;
_locale = RETAIN([NSLocale currentLocale]); _locale = RETAIN([NSLocale currentLocale]);
_tz = RETAIN([NSTimeZone defaultTimeZone]); _tz = RETAIN([NSTimeZone defaultTimeZone]);
_calendar = RETAIN([NSCalendar currentCalendar]);
[self _resetUDateFormat]; [self _resetUDateFormat];
@ -201,6 +202,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
{ {
_dateFormat = [format copy]; _dateFormat = [format copy];
_allowsNaturalLanguage = flag; _allowsNaturalLanguage = flag;
_behavior = NSDateFormatterBehavior10_0;
return self; return self;
} }
@ -402,12 +404,17 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
- (NSCalendar *) calendar - (NSCalendar *) calendar
{ {
return nil; return _calendar;
} }
- (void) setCalendar: (NSCalendar *) calendar - (void) setCalendar: (NSCalendar *) calendar
{ {
return; if (calendar == _calendar)
return;
RELEASE(_calendar);
_calendar = RETAIN(calendar);
[self _resetUDateFormat];
} }
- (NSDate *) defaultDate - (NSDate *) defaultDate

2
Source/NSNumberFormatter.m
View file

@ -782,7 +782,7 @@ static NSUInteger _defaultBehavior = 0;
} }
#endif #endif
} }
else if (_behavior == NSNumberFormatterBehavior10_0 else if (_behavior == NSNumberFormatterBehavior10_0)
{ {
NSMutableDictionary *locale; NSMutableDictionary *locale;
NSCharacterSet *formattingCharacters; NSCharacterSet *formattingCharacters;