aboutsummaryrefslogtreecommitdiff
path: root/UnitTesting
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2014-06-06 16:30:05 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2014-06-06 16:30:05 +0000
commit812a1463b42c00a337af9637e47c7d6368d6f88d (patch)
tree721ace54f0723a301f3dff1c4986a9da448e29a2 /UnitTesting
parent62988ae187a1b2860b6a07f57e3a0ba89bd1e456 (diff)
Fix up the gate on GTMSenTestCase and iOS 8 so that it is safer in case a new version of
Xcode 5 comes out with __IPHONE_8_0 declared in the iOS 7 SDK. DELTA=2 (0 added, 0 deleted, 2 changed) DELTA_BY_EXTENSION=h=2
Diffstat (limited to 'UnitTesting')
-rw-r--r--UnitTesting/GTMSenTestCase.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/UnitTesting/GTMSenTestCase.h b/UnitTesting/GTMSenTestCase.h
index 58ff97d..8effb50 100644
--- a/UnitTesting/GTMSenTestCase.h
+++ b/UnitTesting/GTMSenTestCase.h
@@ -82,13 +82,13 @@ NSString *STComposeString(NSString *, ...);
#define _XCExceptionFormatString @"throwing \"%@\""
#define _XCUnknownExceptionString @"throwing an unknown exception"
-#if defined __IPHONE_8_0
+#if defined(__IPHONE_8_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
// They changed the call to _XCTRegisterFailure in iOS 8. Once we no longer need to support
// the iOS 7 SDK, we can remove this.
#define _GTMXCRegisterFailure(expression, format...) _XCTRegisterFailure(self, expression, format)
#else
#define _GTMXCRegisterFailure(expression, format...) _XCTRegisterFailure(expression, format)
-#endif // defined __IPHONE_8_0
+#endif // defined defined(__IPHONE_8_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
// Generates a failure when a1 != noErr
// Args: