Commit bfcdab7e authored by Jacob Potter's avatar Jacob Potter

Use ObjcType instead of id<$self>

parent ce6d6620
...@@ -19,7 +19,7 @@ public: ...@@ -19,7 +19,7 @@ public:
void update(const ::textsort::ItemList & items) override void update(const ::textsort::ItemList & items) override
{ {
@autoreleasepool { @autoreleasepool {
[Handle::get() update:(::djinni_generated::ItemList::fromCpp(items))]; [(ObjcType)Handle::get() update:(::djinni_generated::ItemList::fromCpp(items))];
} }
} }
}; };
......
...@@ -178,7 +178,7 @@ class ObjcppGenerator(spec: Spec) extends Generator(spec) { ...@@ -178,7 +178,7 @@ class ObjcppGenerator(spec: Spec) extends Generator(spec) {
w.wl(s"$ret ${idCpp.method(m.ident)}${params.mkString("(", ", ", ")")} override").braced { w.wl(s"$ret ${idCpp.method(m.ident)}${params.mkString("(", ", ", ")")} override").braced {
w.w("@autoreleasepool").braced { w.w("@autoreleasepool").braced {
val ret = m.ret.fold("")(_ => "auto r = ") val ret = m.ret.fold("")(_ => "auto r = ")
val call = s"[(id<$self>)Handle::get() ${idObjc.method(m.ident)}" val call = s"[(ObjcType)Handle::get() ${idObjc.method(m.ident)}"
writeAlignedObjcCall(w, ret + call, m.params, "]", p => (idObjc.field(p.ident), s"(${objcppMarshal.fromCpp(p.ty, idCpp.local(p.ident))})")) writeAlignedObjcCall(w, ret + call, m.params, "]", p => (idObjc.field(p.ident), s"(${objcppMarshal.fromCpp(p.ty, idCpp.local(p.ident))})"))
w.wl(";") w.wl(";")
m.ret.fold()(r => { w.wl(s"return ${objcppMarshal.toCpp(r, "r")};") }) m.ret.fold()(r => { w.wl(s"return ${objcppMarshal.toCpp(r, "r")};") })
......
...@@ -20,7 +20,7 @@ public: ...@@ -20,7 +20,7 @@ public:
::ClientReturnedRecord get_record(int64_t record_id, const std::string & utf8string, const std::experimental::optional<std::string> & misc) override ::ClientReturnedRecord get_record(int64_t record_id, const std::string & utf8string, const std::experimental::optional<std::string> & misc) override
{ {
@autoreleasepool { @autoreleasepool {
auto r = [(id<DBClientInterface>)Handle::get() getRecord:(::djinni::I64::fromCpp(record_id)) auto r = [(ObjcType)Handle::get() getRecord:(::djinni::I64::fromCpp(record_id))
utf8string:(::djinni::String::fromCpp(utf8string)) utf8string:(::djinni::String::fromCpp(utf8string))
misc:(::djinni::Optional<std::experimental::optional, ::djinni::String>::fromCpp(misc))]; misc:(::djinni::Optional<std::experimental::optional, ::djinni::String>::fromCpp(misc))];
return ::djinni_generated::ClientReturnedRecord::toCpp(r); return ::djinni_generated::ClientReturnedRecord::toCpp(r);
...@@ -29,7 +29,7 @@ public: ...@@ -29,7 +29,7 @@ public:
std::string return_str() override std::string return_str() override
{ {
@autoreleasepool { @autoreleasepool {
auto r = [(id<DBClientInterface>)Handle::get() returnStr]; auto r = [(ObjcType)Handle::get() returnStr];
return ::djinni::String::toCpp(r); return ::djinni::String::toCpp(r);
} }
} }
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
std::string whoami() override std::string whoami() override
{ {
@autoreleasepool { @autoreleasepool {
auto r = [(id<DBToken>)Handle::get() whoami]; auto r = [(ObjcType)Handle::get() whoami];
return ::djinni::String::toCpp(r); return ::djinni::String::toCpp(r);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment