Fix old cast style use in generated file and support lib.

dropbox · Oct 18, 2019 · d73142c · d73142c
1 parent 3aa304c
commit d73142c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/source/JNIGenerator.scala b/src/source/JNIGenerator.scala
@@ -405,9 +405,9 @@ class JNIGenerator(spec: Spec) extends Generator(spec) {
   def toJniCall(ty: TypeRef, f: String => String): String = toJniCall(ty.resolved, f, false)
   def toJniCall(m: MExpr, f: String => String, needRef: Boolean): String = m.base match {
     case p: MPrimitive => f(if (needRef) "Object" else IdentStyle.camelUpper(p.jName))
-    case MString => "(jstring)" + f("Object")
+    case MString => "reinterpret_cast<jstring>(" + f("Object") + ")"
     case MOptional => toJniCall(m.args.head, f, true)
-    case MBinary => "(jbyteArray)" + f("Object")
+    case MBinary => "reinterpret_cast<jbyteArray>(" + f("Object") + ")"
     case _ => f("Object")
   }
 

diff --git a/support-lib/objc/DJIMarshal+Private.h b/support-lib/objc/DJIMarshal+Private.h
@@ -165,7 +165,7 @@ struct WString {
         assert(string);
         NSStringEncoding encoding = getWCharEncoding<sizeof(wchar_t)>();
         NSData* data = [string dataUsingEncoding:encoding];
-        return std::wstring((wchar_t*)[data bytes], [data length] / sizeof (wchar_t));
+        return std::wstring(reinterpret_cast<wchar_t*>([data bytes]), [data length] / sizeof (wchar_t));
     }
 
     static ObjcType fromCpp(const CppType& string) {