[google-toolbox-for-mac] r577 committed - [Author: craigwilkinson]...

15 views
Skip to first unread message

google-tool...@googlecode.com

unread,
Sep 17, 2012, 2:30:29 PM9/17/12
to google-tool...@googlegroups.com
Revision: 577
Author: gtm.daemon
Date: Mon Sep 17 11:30:09 2012
Log: [Author: craigwilkinson]

Allow GTMStackTraceFromException for iOS >= 2.0

R=dmaclach
APPROVED=dmaclach
DELTA=5 (3 added, 0 deleted, 2 changed)
http://code.google.com/p/google-toolbox-for-mac/source/detail?r=577

Modified:
/trunk/Foundation/GTMStackTrace.h
/trunk/Foundation/GTMStackTrace.m

=======================================
--- /trunk/Foundation/GTMStackTrace.h Wed Jun 2 10:36:03 2010
+++ /trunk/Foundation/GTMStackTrace.h Mon Sep 17 11:30:09 2012
@@ -53,7 +53,8 @@

NSString *GTMStackTrace(void);

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 || \
+ __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0
// Returns a string containing a nicely formatted stack trace from the
// exception. Only available on 10.5 or later, uses
// -[NSException callStackReturnAddresses].
=======================================
--- /trunk/Foundation/GTMStackTrace.m Tue Jul 31 09:00:20 2012
+++ /trunk/Foundation/GTMStackTrace.m Mon Sep 17 11:30:09 2012
@@ -349,7 +349,8 @@
return result;
}

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 || \
+__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0

NSString *GTMStackTraceFromException(NSException *e) {
NSString *trace = @"";
@@ -381,3 +382,4 @@
}

#endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ //__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0
Reply all
Reply to author
Forward
0 new messages