diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-04 04:13:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 04:13:22 +0000 |
| commit | f004fabbe7567773c3a7f0ce3ae491ebede74e17 (patch) | |
| tree | cba6f21543a8244d6ab57a1969c49884d65f7612 /runtime/jni_internal.cc | |
| parent | 9bc5dd95f72e43e5e640ad7674dba52bc5b30c4b (diff) | |
| parent | 1525ed874f8611368ef34a9fc5556cc9130ccee6 (diff) | |
| download | art-f004fabbe7567773c3a7f0ce3ae491ebede74e17.tar.gz art-f004fabbe7567773c3a7f0ce3ae491ebede74e17.tar.bz2 art-f004fabbe7567773c3a7f0ce3ae491ebede74e17.zip | |
am 1525ed87: am a10a8b56: Merge "Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags."
* commit '1525ed874f8611368ef34a9fc5556cc9130ccee6':
Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags.
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index ad06b85f36..dd66af72f7 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -1749,6 +1749,7 @@ class JNI { } static void ReleaseStringCritical(JNIEnv* env, jstring java_string, const jchar* chars) { + UNUSED(chars); CHECK_NON_NULL_ARGUMENT_RETURN_VOID(java_string); ScopedObjectAccess soa(env); gc::Heap* heap = Runtime::Current()->GetHeap(); @@ -1777,7 +1778,7 @@ class JNI { return bytes; } - static void ReleaseStringUTFChars(JNIEnv* env, jstring, const char* chars) { + static void ReleaseStringUTFChars(JNIEnv*, jstring, const char* chars) { delete[] chars; } |