diff options
| -rw-r--r-- | UnitTesting/GTMDevLogUnitTestingBridge.m | 4 | ||||
| -rw-r--r-- | UnitTesting/GTMUnitTestDevLog.m | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/UnitTesting/GTMDevLogUnitTestingBridge.m b/UnitTesting/GTMDevLogUnitTestingBridge.m index 3fe66f2..11aee7d 100644 --- a/UnitTesting/GTMDevLogUnitTestingBridge.m +++ b/UnitTesting/GTMDevLogUnitTestingBridge.m @@ -31,8 +31,10 @@ // // 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; @@ -44,4 +46,6 @@ 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 7c7b293..8c76e3c 100644 --- a/UnitTesting/GTMUnitTestDevLog.m +++ b/UnitTesting/GTMUnitTestDevLog.m @@ -158,8 +158,10 @@ 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 @@ -197,7 +199,9 @@ 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; |