Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adjust method signatures for Xcode 12.5 compatibility #2305

Merged
merged 1 commit into from
Apr 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions RxCocoa/Runtime/_RXObjCRuntime.m
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ -(BOOL)ensureSwizzledSelector:(SEL __nonnull)selector

#if TRACE_RESOURCES

NSInteger RX_number_of_dynamic_subclasses() {
NSInteger RX_number_of_dynamic_subclasses(void) {
__block NSInteger count = 0;
[[RXObjCRuntime instance] performLocked:^(RXObjCRuntime * __nonnull self) {
count = self.dynamicSubclassByRealClass.count;
Expand All @@ -1031,7 +1031,7 @@ NSInteger RX_number_of_dynamic_subclasses() {
return count;
}

NSInteger RX_number_of_forwarding_enabled_classes() {
NSInteger RX_number_of_forwarding_enabled_classes(void) {
__block NSInteger count = 0;
[[RXObjCRuntime instance] performLocked:^(RXObjCRuntime * __nonnull self) {
count = self.classesThatSupportObservingByForwarding.count;
Expand All @@ -1040,7 +1040,7 @@ NSInteger RX_number_of_forwarding_enabled_classes() {
return count;
}

NSInteger RX_number_of_intercepting_classes() {
NSInteger RX_number_of_intercepting_classes(void) {
__block NSInteger count = 0;
[[RXObjCRuntime instance] performLocked:^(RXObjCRuntime * __nonnull self) {
count = self.interceptorIMPbySelectorsByClass.count;
Expand All @@ -1049,11 +1049,11 @@ NSInteger RX_number_of_intercepting_classes() {
return count;
}

NSInteger RX_number_of_forwarded_methods() {
NSInteger RX_number_of_forwarded_methods(void) {
return numberOfForwardedMethods;
}

NSInteger RX_number_of_swizzled_methods() {
NSInteger RX_number_of_swizzled_methods(void) {
return numberOInterceptedMethods;
}

Expand Down
10 changes: 5 additions & 5 deletions Tests/RxCocoaTests/RXObjCRuntime+Testing.m
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ -(NSInteger)message_allSupportedParameters:(id __nullable)p1
p15:(int8_t * __nullable)p15 \
p16:(some_insanely_large_struct_t)p16 { \
[self.privateBaseMessages addObject:A( \
p1 ?: [NSNull null], \
p2 ?: [NSNull null], \
p1, \
p2, \
p3 ?: defaultImpl, \
@(p4), \
@(p5), \
Expand Down Expand Up @@ -562,9 +562,9 @@ -(NSInteger)message_allSupportedParameters:(id __nullable)p1
p14:(const int8_t * __nullable)p14 \
p15:(int8_t * __nullable)p15 \
p16:(some_insanely_large_struct_t)p16 { \
[self.privateMessages addObject:A( \
p1 ?: [NSNull null], \
p2 ?: [NSNull null], \
[self.privateMessages addObject:A( \
p1, \
p2, \
p3 ?: defaultImpl, \
@(p4), \
@(p5), \
Expand Down