diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-21 18:00:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-21 18:00:38 +0000 |
| commit | dd384859b6686909e783c8b714accdea6a962c04 (patch) | |
| tree | e1184a0d0a661b09a0191f020984a69bf65603f0 /luni | |
| parent | 84c957a479f28ebf8b15c757add4be75a3960ceb (diff) | |
| parent | b717644f67c8bba023e581a54cdd99e5c2ec7e28 (diff) | |
| download | libcore-dd384859b6686909e783c8b714accdea6a962c04.zip libcore-dd384859b6686909e783c8b714accdea6a962c04.tar.gz libcore-dd384859b6686909e783c8b714accdea6a962c04.tar.bz2 | |
Merge "Fix NativeBreakIterator_cloneImpl return type."
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/native/libcore_icu_NativeBreakIterator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/native/libcore_icu_NativeBreakIterator.cpp b/luni/src/main/native/libcore_icu_NativeBreakIterator.cpp index ce8a72c..0c8c3c9 100644 --- a/luni/src/main/native/libcore_icu_NativeBreakIterator.cpp +++ b/luni/src/main/native/libcore_icu_NativeBreakIterator.cpp @@ -119,7 +119,7 @@ class BreakIteratorAccessor { } \ return reinterpret_cast<uintptr_t>(it) -static jint NativeBreakIterator_cloneImpl(JNIEnv* env, jclass, jlong address) { +static jlong NativeBreakIterator_cloneImpl(JNIEnv* env, jclass, jlong address) { BreakIteratorAccessor it(env, address); return reinterpret_cast<uintptr_t>(it->clone()); } |