Rename method to avoid shadowing unrelated NSObject method (revealed …

…by AppCode)
hamcrest · Dec 8, 2012 · 6592655 · 6592655
1 parent 1899559
commit 6592655
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Library/Object/HCConformsToProtocol.h b/Source/Library/Object/HCConformsToProtocol.h
@@ -13,7 +13,7 @@
     Protocol *theProtocol;
 }
 
-+ (id)conformsToProtocol:(Protocol *)protocol;
++ (id)conformsTo:(Protocol *)protocol;
 - (id)initWithProtocol:(Protocol *)protocol;
 
 @end

diff --git a/Source/Library/Object/HCConformsToProtocol.m b/Source/Library/Object/HCConformsToProtocol.m
@@ -13,7 +13,7 @@
 
 @implementation HCConformsToProtocol
 
-+ (id)conformsToProtocol:(Protocol *)protocol
++ (id)conformsTo:(Protocol *)protocol
 {
     return [[self alloc] initWithProtocol:protocol];
 }
@@ -46,7 +46,7 @@ - (void)describeTo:(id<HCDescription>)description
 
 id<HCMatcher> HC_conformsTo(Protocol *aProtocol)
 {
-    return [HCConformsToProtocol conformsToProtocol:aProtocol];
+    return [HCConformsToProtocol conformsTo:aProtocol];
 }
 
 id<HCMatcher> HC_conformsToProtocol(Protocol *aProtocol)