From 3d42089a8fac73ca2c437fdfffaffc12ac540159 Mon Sep 17 00:00:00 2001
From: "gtm.daemon" <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Wed, 2 Jan 2013 13:00:13 +0000
Subject: [Author: thomasvl]

Remove the GC support code.
Add the needed images for the iOS unittests under iOS 6.0.
Add a workspace file for the iPhone project.

R=dmaclach
DELTA=215  (85 added, 122 deleted, 8 changed)
---
 Foundation/GTMFileSystemKQueue.m           |  8 --------
 Foundation/GTMLightweightProxy.m           | 10 ----------
 Foundation/GTMLogger+ASL.m                 |  7 -------
 Foundation/GTMNSObject+KeyValueObserving.m | 12 ------------
 Foundation/GTMRegex.m                      | 13 -------------
 Foundation/GTMSQLite.m                     | 17 -----------------
 Foundation/GTMSignalHandler.m              |  9 ---------
 7 files changed, 76 deletions(-)

(limited to 'Foundation')

diff --git a/Foundation/GTMFileSystemKQueue.m b/Foundation/GTMFileSystemKQueue.m
index 7114304..a66dc47 100644
--- a/Foundation/GTMFileSystemKQueue.m
+++ b/Foundation/GTMFileSystemKQueue.m
@@ -85,14 +85,6 @@ static CFSocketRef gRunLoopSocket = NULL;
   return self;
 }
 
-#if GTM_SUPPORT_GC
-- (void)finalize {
-  [self unregisterWithKQueue];
-
-  [super finalize];
-}
-#endif
-
 - (void)dealloc {
   [self unregisterWithKQueue];
   [path_ release];
diff --git a/Foundation/GTMLightweightProxy.m b/Foundation/GTMLightweightProxy.m
index 643478a..dc89807 100644
--- a/Foundation/GTMLightweightProxy.m
+++ b/Foundation/GTMLightweightProxy.m
@@ -31,16 +31,6 @@
   return [self initWithRepresentedObject:nil];
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-#if GTM_SUPPORT_GC
-// -[NSProxy finalize] is only in 10.5 or later
-- (void)finalize {
-  representedObject_ = nil;
-  [super finalize];
-}
-#endif
-#endif
-
 - (void)dealloc {
   // it's weak, we don't release
   representedObject_ = nil;
diff --git a/Foundation/GTMLogger+ASL.m b/Foundation/GTMLogger+ASL.m
index a4299dc..43375fe 100644
--- a/Foundation/GTMLogger+ASL.m
+++ b/Foundation/GTMLogger+ASL.m
@@ -157,13 +157,6 @@
   [super dealloc];
 }
 
-#if GTM_SUPPORT_GC
-- (void)finalize {
-  if (client_ != NULL) asl_close(client_);
-  [super finalize];
-}
-#endif
-
 // We don't test this one line because we don't want to pollute actual system
 // logs with test messages.
 // COV_NF_START
diff --git a/Foundation/GTMNSObject+KeyValueObserving.m b/Foundation/GTMNSObject+KeyValueObserving.m
index 8d6580d..814419b 100644
--- a/Foundation/GTMNSObject+KeyValueObserving.m
+++ b/Foundation/GTMNSObject+KeyValueObserving.m
@@ -121,18 +121,6 @@ static char* GTMKeyValueObservingHelperContext
           NSStringFromSelector(selector_)];
 }
 
-#if GTM_SUPPORT_GC
-
-- (void)finalize {
-  if (target_) {
-    _GTMDevLog(@"Didn't deregister %@", self);
-    [self deregister];
-  }
-  [super finalize];
-}
-
-#endif  // GTM_SUPPORT_GC
-
 - (void)dealloc {
   if (target_) {
     _GTMDevLog(@"Didn't deregister %@", self);
diff --git a/Foundation/GTMRegex.m b/Foundation/GTMRegex.m
index d0b831c..238ca48 100644
--- a/Foundation/GTMRegex.m
+++ b/Foundation/GTMRegex.m
@@ -190,19 +190,6 @@ static NSString *const kReplacementPattern =
   return self;
 }
 
-#if GTM_SUPPORT_GC
-- (void)finalize {
-  // we used pattern_ as our flag that we initialized the regex_t
-  if (pattern_) {
-    regfree(&regexData_);
-    [pattern_ release];
-    // play it safe and clear it since we use it as a flag for regexData_
-    pattern_ = nil;
-  }
-  [super finalize];
-}
-#endif
-
 - (void)dealloc {
   // we used pattern_ as our flag that we initialized the regex_t
   if (pattern_) {
diff --git a/Foundation/GTMSQLite.m b/Foundation/GTMSQLite.m
index 4313949..29980ae 100644
--- a/Foundation/GTMSQLite.m
+++ b/Foundation/GTMSQLite.m
@@ -224,13 +224,6 @@ static CFLocaleRef gCurrentLocale = NULL;
                   errorCode:err];
 }
 
-#if GTM_SUPPORT_GC
-- (void)finalize {
-  [self cleanupDB];
-  [super finalize];
-}
-#endif
-
 - (void)dealloc {
   [self cleanupDB];
   [super dealloc];
@@ -1717,16 +1710,6 @@ static void Glob16(sqlite3_context *context, int argc, sqlite3_value **argv) {
   return obj;
 }
 
-#if GTM_SUPPORT_GC
-- (void)finalize {
-  if (statement_) {
-    _GTMDevLog(@"-[GTMSQLiteStatement finalizeStatement] must be called when"
-               @" statement is no longer needed");
-  }
-  [super finalize];
-}
-#endif
-
 - (void)dealloc {
   if (statement_) {
     _GTMDevLog(@"-[GTMSQLiteStatement finalizeStatement] must be called when"
diff --git a/Foundation/GTMSignalHandler.m b/Foundation/GTMSignalHandler.m
index 677c10a..26a06f1 100644
--- a/Foundation/GTMSignalHandler.m
+++ b/Foundation/GTMSignalHandler.m
@@ -86,15 +86,6 @@ static CFSocketRef gRunLoopSocket = NULL;
   return self;
 }
 
-#if GTM_SUPPORT_GC
-
-- (void)finalize {
-  [self invalidate];
-  [super finalize];
-}
-
-#endif
-
 - (void)dealloc {
   [self invalidate];
   [super dealloc];
-- 
cgit v1.2.3