From cab5471a7ba0f45273f293104f5d00d1af8284ac Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Wed, 1 May 2019 13:23:23 +0200 Subject: SwiftMix: Get rid of pointer types mismatch warning --- Tests/SwiftMix/CMain.c | 6 +++--- Tests/SwiftMix/ObjCMain.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/SwiftMix/CMain.c b/Tests/SwiftMix/CMain.c index 8877da4..519058e 100644 --- a/Tests/SwiftMix/CMain.c +++ b/Tests/SwiftMix/CMain.c @@ -1,5 +1,5 @@ -extern int ObjCMain(int argc, char const* const argv[]); -int main(int argc, char* argv[]) +extern int ObjCMain(void); +int main(void) { - return ObjCMain(argc, argv); + return ObjCMain(); } diff --git a/Tests/SwiftMix/ObjCMain.m b/Tests/SwiftMix/ObjCMain.m index 20f0bf1..afc92438 100644 --- a/Tests/SwiftMix/ObjCMain.m +++ b/Tests/SwiftMix/ObjCMain.m @@ -1,4 +1,4 @@ #import "SwiftMix-Swift.h" -int ObjCMain(int argc, char const* const argv[]) { +int ObjCMain(void) { return [SwiftMainClass SwiftMain]; } -- cgit v0.12 From b7b66919a3952a3a2c31d659fcbe3bebf7e5887e Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Wed, 1 May 2019 13:24:34 +0200 Subject: SwiftMix: properly export SwiftMain method --- Tests/SwiftMix/CMakeLists.txt | 1 + Tests/SwiftMix/SwiftMain.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/SwiftMix/CMakeLists.txt b/Tests/SwiftMix/CMakeLists.txt index 5e50470..6d8e48b 100644 --- a/Tests/SwiftMix/CMakeLists.txt +++ b/Tests/SwiftMix/CMakeLists.txt @@ -3,3 +3,4 @@ project(SwiftMix C Swift) add_executable(SwiftMix CMain.c ObjCMain.m SwiftMain.swift ObjC-Swift.h) set_property(TARGET SwiftMix PROPERTY XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "ObjC-Swift.h") +target_compile_options(SwiftMix PRIVATE "$<$:-Werror=objc-method-access>") diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift index a4a0a62..d9c8cd7 100644 --- a/Tests/SwiftMix/SwiftMain.swift +++ b/Tests/SwiftMix/SwiftMain.swift @@ -1,7 +1,7 @@ import Foundation @objc class SwiftMainClass : NSObject { - class func SwiftMain() -> Int32 { + @objc class func SwiftMain() -> Int32 { dump("Hello World!"); return 0; } -- cgit v0.12