Fix build failure on Xcode 12.5 beta 3 #2297
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vincentisambart
commented
Mar 12, 2021
| @@ -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) { | |||
There was a problem hiding this comment.
Xcode gave the following error before the fix:
.../RxSwift/RxCocoa/Runtime/_RXObjCRuntime.m:1025:42: error: this old-style function definition is not preceded by a prototype [-Werror,-Wstrict-prototypes]
NSInteger RX_number_of_dynamic_subclasses() {
^
.../RxSwift/RxCocoa/Runtime/_RXObjCRuntime.m:1034:50: error: this old-style function definition is not preceded by a prototype [-Werror,-Wstrict-prototypes]
NSInteger RX_number_of_forwarding_enabled_classes() {
^
.../RxSwift/RxCocoa/Runtime/_RXObjCRuntime.m:1043:44: error: this old-style function definition is not preceded by a prototype [-Werror,-Wstrict-prototypes]
NSInteger RX_number_of_intercepting_classes() {
^
.../RxSwift/RxCocoa/Runtime/_RXObjCRuntime.m:1052:41: error: this old-style function definition is not preceded by a prototype [-Werror,-Wstrict-prototypes]
NSInteger RX_number_of_forwarded_methods() {
^
.../RxSwift/RxCocoa/Runtime/_RXObjCRuntime.m:1056:40: error: this old-style function definition is not preceded by a prototype [-Werror,-Wstrict-prototypes]
NSInteger RX_number_of_swizzled_methods() {
^
5 errors generated.
vincentisambart
commented
Mar 12, 2021
| @@ -307,7 +307,7 @@ -(NSInteger)message_allSupportedParameters:(id __nullable)p1 | |||
| p16:(some_insanely_large_struct_t)p16 { \ | |||
| [self.privateBaseMessages addObject:A( \ | |||
| p1 ?: [NSNull null], \ | |||
| p2 ?: [NSNull null], \ | |||
| (id)p2 ?: [NSNull null], \ | |||
There was a problem hiding this comment.
Without these changes, the library built successfully, but Xcode could not build the tests with the following error:
.../RxSwift/Tests/RxCocoaTests/RXObjCRuntime+Testing.m:604:1: error: incompatible operand types ('Class _Nullable' and 'NSNull * _Nonnull') [-Werror]
IMPLEMENT_OBSERVING_CLASS_PAIR_FOR_TEST(shared)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../RxSwift/Tests/RxCocoaTests/RXObjCRuntime+Testing.m:56:59: note: expanded from macro 'IMPLEMENT_OBSERVING_CLASS_PAIR_FOR_TEST'
#define IMPLEMENT_OBSERVING_CLASS_PAIR_FOR_TEST(testName) _IMPLEMENT_OBSERVING_CLASS_PAIR_FOR_TEST(testName,,)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../RxSwift/Tests/RxCocoaTests/RXObjCRuntime+Testing.m:310:12: note: expanded from macro '_IMPLEMENT_OBSERVING_CLASS_PAIR_FOR_TEST'
p2 ?: [NSNull null], \
~~ ^ ~~~~~~~~~~~~~
.../RxSwift/Tests/RxCocoaTests/RXObjCRuntime+Testing.m:17:49: note: expanded from macro 'A'
#define A(...) [Arguments argumentsWithValues:@[__VA_ARGS__]]
^~~~~~~~~~~
It was complaining that p2 being a Class does not go well along with a NSNull so I made sure p2 was seen as an id with a cast.
freak4pc
approved these changes
Mar 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When I tried building our app with Xcode 12.5 beta 3, it failed building RxCocoa.
Here are fixes for RxSwift and AllTests to build (and run) successfully on Xcode 12.5 (I also made sure I did not break Xcode 12.4).