diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-04 04:06:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 04:06:06 +0000 |
| commit | 1525ed874f8611368ef34a9fc5556cc9130ccee6 (patch) | |
| tree | 7c01027baece27d580f30dfbd28e11b50e220918 /runtime/jni_internal.cc | |
| parent | 9d7bf4ead004f8fc00aacd3b5dd860c61348f2fb (diff) | |
| parent | a10a8b56a01be95b3ec13022d3a155e163a11673 (diff) | |
| download | art-1525ed874f8611368ef34a9fc5556cc9130ccee6.tar.gz art-1525ed874f8611368ef34a9fc5556cc9130ccee6.tar.bz2 art-1525ed874f8611368ef34a9fc5556cc9130ccee6.zip | |
am a10a8b56: Merge "Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags."
* commit 'a10a8b56a01be95b3ec13022d3a155e163a11673':
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 ba38b65d4b..51f88c5731 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -1750,6 +1750,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(); @@ -1778,7 +1779,7 @@ class JNI { return bytes; } - static void ReleaseStringUTFChars(JNIEnv* env, jstring, const char* chars) { + static void ReleaseStringUTFChars(JNIEnv*, jstring, const char* chars) { delete[] chars; } |