| Index: talk/app/webrtc/java/jni/jni_helpers.cc
|
| diff --git a/talk/app/webrtc/java/jni/jni_helpers.cc b/talk/app/webrtc/java/jni/jni_helpers.cc
|
| index 755698e37978c65d177e43c23ae286ae454f8fe8..31215973d6967f29fd5742896f51b037201df644 100644
|
| --- a/talk/app/webrtc/java/jni/jni_helpers.cc
|
| +++ b/talk/app/webrtc/java/jni/jni_helpers.cc
|
| @@ -148,7 +148,7 @@ JNIEnv* AttachCurrentThreadIfNeeded() {
|
| // Return a |jlong| that will correctly convert back to |ptr|. This is needed
|
| // because the alternative (of silently passing a 32-bit pointer to a vararg
|
| // function expecting a 64-bit param) picks up garbage in the high 32 bits.
|
| -jlong jlongFromPointer(void* ptr) {
|
| +jlong jlongFromPointer(const void* ptr) {
|
| static_assert(sizeof(intptr_t) <= sizeof(jlong),
|
| "Time to rethink the use of jlongs");
|
| // Going through intptr_t to be obvious about the definedness of the
|
|
|