Bug 1034689 followup - Add jchar cast back to fix Android compile errors.
authorJan de Mooij <jdemooij@mozilla.com>
Sat, 12 Jul 2014 09:53:01 +0200
changeset 215657 247a5733d2bad51ae9f6830fcba776886247db3c
parent 215656 06fc258b16f8196a1fbb6c83f8af92d4a316eb1f
child 215658 e938da5fdc1a42a61b092a48719a7c68c8ea0deb
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1034689
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1034689 followup - Add jchar cast back to fix Android compile errors.
widget/android/NativeJSContainer.cpp
--- a/widget/android/NativeJSContainer.cpp
+++ b/widget/android/NativeJSContainer.cpp
@@ -502,17 +502,19 @@ struct StringProperty
     }
 
     static Type FromValue(JNIEnv* env, jobject instance,
                           JSContext* cx, const JS::HandleString str) {
         nsAutoJSString autoStr;
         if (!CheckJSCall(env, autoStr.init(cx, str))) {
             return nullptr;
         }
-        jstring ret = env->NewString(autoStr.BeginReading(), autoStr.Length());
+        jstring ret = env->NewString(
+            reinterpret_cast<const jchar*>(autoStr.BeginReading()),
+            autoStr.Length());
         MOZ_ASSERT(ret);
         return ret;
     }
 };
 
 template <jclass& C, jobject (*FactoryMethod)
     (JNIEnv*, jobject, JSContext*, JS::HandleObject)>
 struct BaseObjectProperty