mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
Merge from 0.6.5
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6040 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5276d1b6c2
commit
fb65f2b8b6
36 changed files with 1074 additions and 479 deletions
|
@ -33,7 +33,7 @@
|
|||
/* Key for thread dictionary. */
|
||||
static NSString *dict_key = @"_NSAssertionHandler";
|
||||
|
||||
+ (NSAssertionHandler *)currentHandler
|
||||
+ (NSAssertionHandler*)currentHandler
|
||||
{
|
||||
NSMutableDictionary *dict;
|
||||
NSAssertionHandler *handler;
|
||||
|
@ -48,10 +48,10 @@ static NSString *dict_key = @"_NSAssertionHandler";
|
|||
return handler;
|
||||
}
|
||||
|
||||
- (void)handleFailureInFunction:(NSString *)functionName
|
||||
file:(NSString *)fileName
|
||||
lineNumber:(int)line
|
||||
description:(NSString *)format,...
|
||||
- (void) handleFailureInFunction: (NSString*)functionName
|
||||
file: (NSString*)fileName
|
||||
lineNumber: (int)line
|
||||
description: (NSString*)format,...
|
||||
{
|
||||
id message;
|
||||
va_list ap;
|
||||
|
@ -59,8 +59,8 @@ static NSString *dict_key = @"_NSAssertionHandler";
|
|||
va_start(ap, format);
|
||||
message =
|
||||
[NSString
|
||||
stringWithFormat: @"Assertion failed in %@, file %@:%d. %@",
|
||||
functionName, fileName, line, format];
|
||||
stringWithFormat: @"%@:%d Assertion failed in %@. %@",
|
||||
fileName, line, functionName, format];
|
||||
NSLogv(message, ap);
|
||||
va_end(ap);
|
||||
|
||||
|
@ -81,9 +81,9 @@ static NSString *dict_key = @"_NSAssertionHandler";
|
|||
va_start(ap, format);
|
||||
message =
|
||||
[NSString
|
||||
stringWithFormat: @"Assertion failed in %s, method %s, file %@:%d. %@",
|
||||
object_get_class_name(object), sel_get_name(aSelector),
|
||||
fileName, line, format];
|
||||
stringWithFormat: @"%@:%d Assertion failed in %s, method %s. %@",
|
||||
fileName, line, object_get_class_name(object), sel_get_name(aSelector),
|
||||
format];
|
||||
NSLogv(message, ap);
|
||||
|
||||
[NSException raise: NSInternalInconsistencyException
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue