# HG changeset patch # User Jens Alfke # Date 1212258377 25200 # Node ID 66b870428f85ff3caf98cb6b041dfd5bc4a0c968 # Parent e5976864dfe936a7e78ab2a87302b48f3f68efa7 * Worked around compiler warnings in Test.h when building for iPhone. * Made Mercurial ignore the documentation files. diff -r e5976864dfe9 -r 66b870428f85 .hgignore --- a/.hgignore Sat May 24 13:24:33 2008 -0700 +++ b/.hgignore Sat May 31 11:26:17 2008 -0700 @@ -1,6 +1,8 @@ syntax: glob .DS_Store build +Documentation +Doxyfile .svn *.pbxuser *.perspectivev3 diff -r e5976864dfe9 -r 66b870428f85 Test.h --- a/Test.h Sat May 24 13:24:33 2008 -0700 +++ b/Test.h Sat May 31 11:26:17 2008 -0700 @@ -59,7 +59,7 @@ /** General-purpose assertions, replacing NSAssert etc.. You can use these outside test cases. */ #define Assert(COND,MSG...) do{ if( __builtin_expect(!(COND),NO) ) { \ - IN_SEGMENT_NORETURN(Logging) {_AssertFailed(self,(const char*)_cmd, __FILE__, __LINE__,\ + IN_SEGMENT_NORETURN(Logging) {_AssertFailed(self,_cmd, __FILE__, __LINE__,\ #COND,##MSG,NULL);} } }while(0) #define CAssert(COND,MSG...) do{ if( __builtin_expect(!(COND),NO) ) { \ static const char *_name = __PRETTY_FUNCTION__;\ @@ -90,5 +90,5 @@ struct TestCaseLink {void (*testptr)(); const char *name; BOOL passed; struct TestCaseLink *next;}; extern struct TestCaseLink *gAllTestCases; #endif DEBUG -void _AssertFailed( id rcvr, const char *selOrFn, const char *sourceFile, int sourceLine, +void _AssertFailed( id rcvr, const void *selOrFn, const char *sourceFile, int sourceLine, const char *condString, NSString *message, ... ) __attribute__((noreturn)); diff -r e5976864dfe9 -r 66b870428f85 Test.m --- a/Test.m Sat May 24 13:24:33 2008 -0700 +++ b/Test.m Sat May 31 11:26:17 2008 -0700 @@ -125,7 +125,7 @@ #pragma mark ASSERTION FAILURE HANDLER: -void _AssertFailed( id rcvr, const char *selOrFn, const char *sourceFile, int sourceLine, +void _AssertFailed( id rcvr, const void *selOrFn, const char *sourceFile, int sourceLine, const char *condString, NSString *message, ... ) { if( message ) {