From f90bcf3263b80b96754977ddbd5309704cf817fb Mon Sep 17 00:00:00 2001
From: thomasvl <thomasvl@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Fri, 9 May 2008 18:53:09 +0000
Subject: Flush out suppport for 64bit, GC support. Added some more xcode
 configs related to the above. Removed some classes that the unittesting
 doesn't need (and aren't able to   support 64bit). add base64, httpfetcher,
 and progress monitor stream.

---
 DebugUtils/GTMDebugSelectorValidation.h | 56 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

(limited to 'DebugUtils/GTMDebugSelectorValidation.h')

diff --git a/DebugUtils/GTMDebugSelectorValidation.h b/DebugUtils/GTMDebugSelectorValidation.h
index b3f1e73..82d00e8 100644
--- a/DebugUtils/GTMDebugSelectorValidation.h
+++ b/DebugUtils/GTMDebugSelectorValidation.h
@@ -40,39 +40,37 @@ static void GTMAssertSelectorNilOrImplementedWithArguments(id obj, SEL sel, ...)
   
   if (obj && sel) {
     // check that the selector is implemented
-    if (![obj respondsToSelector:sel]) {
-      _GTMDevAssert(NO,
-                    @"\"%@\" selector \"%@\" is unimplemented or misnamed", 
-                    NSStringFromClass([obj class]), 
-                    NSStringFromSelector(sel));
-    } else {
-      const char *expectedArgType;
-      int argCount = 2; // skip self and _cmd
-      NSMethodSignature *sig = [obj methodSignatureForSelector:sel];
-      
-      // check that each expected argument is present and of the correct type
-      while ((expectedArgType = va_arg(argList, const char*)) != 0) {
+    _GTMDevAssert([obj respondsToSelector:sel],
+                  @"\"%@\" selector \"%@\" is unimplemented or misnamed", 
+                  NSStringFromClass([obj class]), 
+                  NSStringFromSelector(sel));
+
+    const char *expectedArgType;
+    NSUInteger argCount = 2; // skip self and _cmd
+    NSMethodSignature *sig = [obj methodSignatureForSelector:sel];
+    
+    // check that each expected argument is present and of the correct type
+    while ((expectedArgType = va_arg(argList, const char*)) != 0) {
         
-        if ([sig numberOfArguments] > argCount) {
-          const char *foundArgType = [sig getArgumentTypeAtIndex:argCount];
+      if ([sig numberOfArguments] > argCount) {
+        const char *foundArgType = [sig getArgumentTypeAtIndex:argCount];
           
-          _GTMDevAssert(0 == strncmp(foundArgType, expectedArgType, strlen(expectedArgType)),
-                        @"\"%@\" selector \"%@\" argument %d should be type %s", 
-                        NSStringFromClass([obj class]), 
-                        NSStringFromSelector(sel),
-                        (argCount - 2),
-                        expectedArgType);
-        }
-        argCount++;
+        _GTMDevAssert(0 == strncmp(foundArgType, expectedArgType, strlen(expectedArgType)),
+                      @"\"%@\" selector \"%@\" argument %d should be type %s", 
+                      NSStringFromClass([obj class]), 
+                      NSStringFromSelector(sel),
+                      (argCount - 2),
+                      expectedArgType);
       }
-      
-      // check that the proper number of arguments are present in the selector
-      _GTMDevAssert(argCount == [sig numberOfArguments],
-                    @"\"%@\" selector \"%@\" should have %d arguments",
-                    NSStringFromClass([obj class]), 
-                    NSStringFromSelector(sel),
-                    (argCount - 2));
+      argCount++;
     }
+      
+    // check that the proper number of arguments are present in the selector
+    _GTMDevAssert(argCount == [sig numberOfArguments],
+                  @"\"%@\" selector \"%@\" should have %d arguments",
+                  NSStringFromClass([obj class]), 
+                  NSStringFromSelector(sel),
+                  (argCount - 2));
   }
   
   va_end(argList);
-- 
cgit v1.2.3