Fixed merge conflict.

erikdoe · Jan 11, 2021 · 44207bd · 44207bd
2 parents 06e8a9a + a1b2394
commit 44207bd
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/Source/OCMock/NSObject+OCMAdditions.m b/Source/OCMock/NSObject+OCMAdditions.m
@@ -14,18 +14,15 @@
  *  under the License.
  */
 
+#import <objc/message.h>
 #import <objc/runtime.h>
 #import "NSMethodSignature+OCMAdditions.h"
 #import "NSObject+OCMAdditions.h"
 
-
 @implementation NSObject(OCMAdditions)
 
 + (IMP)instanceMethodForwarderForSelector:(SEL)aSelector
 {
-    // use sel_registerName() and not @selector to avoid warning
-    SEL selectorWithNoImplementation = sel_registerName("methodWhichMustNotExist::::");
-
 #ifndef __arm64__
     static NSMutableDictionary *_OCMReturnTypeCache;
 
@@ -49,10 +46,10 @@ + (IMP)instanceMethodForwarderForSelector:(SEL)aSelector
     }
 
     if(needsStructureReturn)
-        return class_getMethodImplementation_stret([NSObject class], selectorWithNoImplementation);
+      return _objc_msgForward_stret;
 #endif
 
-    return class_getMethodImplementation([NSObject class], selectorWithNoImplementation);
+  return _objc_msgForward;
 }
 
 + (void)enumerateMethodsInClass:(Class)aClass usingBlock:(void (^)(Class cls, SEL sel))aBlock