diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-14 12:00:40 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-14 12:00:40 +0000 |
| commit | ee2f682c1d6a20ca483812450c5fa666ec986f15 (patch) | |
| tree | 971b01cbb36290404ad56c6a6f9d9354ed1d8452 | |
| parent | cd93e46818d8e983344696918d3af8e3bff0577a (diff) | |
[Author: thomasvl]
Removing the checks until I can test with more local builds to confirm
it works, to many combinations that can break it seems.
TBR=dmaclach
| -rw-r--r-- | UnitTesting/GTMDevLogUnitTestingBridge.m | 7 | ||||
| -rw-r--r-- | UnitTesting/GTMUnitTestDevLog.m | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/UnitTesting/GTMDevLogUnitTestingBridge.m b/UnitTesting/GTMDevLogUnitTestingBridge.m index 11aee7d..88d4e93 100644 --- a/UnitTesting/GTMDevLogUnitTestingBridge.m +++ b/UnitTesting/GTMDevLogUnitTestingBridge.m @@ -31,10 +31,6 @@ // // See GTMUnitTestDevLog.h for more information on checking logs in unittests. // -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || defined (__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" -#endif // Compiler version checks void _GTMUnitTestDevLog(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2) { Class devLogClass = NSClassFromString(@"GTMUnitTestDevLog"); va_list argList; @@ -46,6 +42,3 @@ void _GTMUnitTestDevLog(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2) { } va_end(argList); } -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || defined (__clang__) -#pragma GCC diagnostic pop -#endif // Compiler version checks diff --git a/UnitTesting/GTMUnitTestDevLog.m b/UnitTesting/GTMUnitTestDevLog.m index 8c76e3c..dbc6a12 100644 --- a/UnitTesting/GTMUnitTestDevLog.m +++ b/UnitTesting/GTMUnitTestDevLog.m @@ -158,10 +158,6 @@ static BOOL gTrackingEnabled = NO; va_end(argList); } -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || defined (__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" -#endif // Compiler version checks + (void)log:(NSString*)format args:(va_list)args { if ([self isTrackingEnabled]) { NSString *logString = [[[NSString alloc] initWithFormat:format @@ -199,9 +195,6 @@ static BOOL gTrackingEnabled = NO; NSLogv(format, args); } } -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || defined (__clang__) -#pragma GCC diagnostic pop -#endif // Compiler version checks + (void)expectString:(NSString *)format, ... { va_list argList; |