From 42124b3691197c3c4f52f069775fa0390a8ff942 Mon Sep 17 00:00:00 2001 From: dmaclach Date: Fri, 7 Oct 2016 12:10:23 -0400 Subject: First cut at pruning things/updating things. Remove a bunch of code that Google stopped using/maintaining rather than trying to update it it. Some would be hard to update, some actually has system provided replacements; others are patterns that just don't seem as common now. Prune out the code related to macOS <= 10.5, start pruning some of the really old iOS support also. Get the projects mostly limping again with modern Xcodes so tests can be run. If someone ends up on this commit via history for something they still find as useful, feel free to do a pull request to bring the snippet of code back to life and update it for current SDKs. --- Foundation/GTMNSThread+Blocks.m | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'Foundation/GTMNSThread+Blocks.m') diff --git a/Foundation/GTMNSThread+Blocks.m b/Foundation/GTMNSThread+Blocks.m index 2476ad5..4ab3ee5 100644 --- a/Foundation/GTMNSThread+Blocks.m +++ b/Foundation/GTMNSThread+Blocks.m @@ -53,17 +53,6 @@ #endif // NS_BLOCKS_AVAILABLE -#if GTM_IPHONE_SDK || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) - -// Only available 10.6 and later. -typedef int (*PThreadSetNameNPPTr)(const char*); -#if !GTM_IPHONE_SDK -static PThreadSetNameNPPTr gPThreadSetNameNP = NULL; -#else -// Defined on iPhone since 3.2 -static PThreadSetNameNPPTr gPThreadSetNameNP = pthread_setname_np; -#endif // !GTM_IPHONE_SDK - enum { kGTMSimpleThreadInitialized = 0, kGTMSimpleThreadStarting, @@ -74,15 +63,6 @@ enum { @implementation GTMSimpleWorkerThread -#if !GTM_IPHONE_SDK -+ (void)initialize { - if (self == [GTMSimpleWorkerThread class]) { - // Resolve pthread_setname_np() on 10.6 and later. - gPThreadSetNameNP = dlsym(RTLD_DEFAULT, "pthread_setname_np"); - } -} -#endif // !GTM_IPHONE_SDK - - (id)init { if ((self = [super init])) { runLock_ = @@ -100,12 +80,10 @@ enum { } - (void)setThreadDebuggerName:(NSString *)name { - if (gPThreadSetNameNP) { - if ([name length]) { - gPThreadSetNameNP([name UTF8String]); - } else { - gPThreadSetNameNP(""); - } + if ([name length]) { + pthread_setname_np([name UTF8String]); + } else { + pthread_setname_np(""); } } @@ -292,5 +270,3 @@ enum { } @end - -#endif // GTM_IPHONE_SDK || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) -- cgit v1.2.3