diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-25 13:05:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 13:05:49 +0000 |
| commit | aaa27fd5a0bb81ac17c25c33beb2656b32100cd6 (patch) | |
| tree | 70b9446dfde8d53858b306dd36a2f4653487388b /opengl/tools/glgen/stubs/gles11/common.cpp | |
| parent | e5c99bf38001d86ca41dfc51fac337aa6a6931f4 (diff) | |
| parent | d8f096114da14f9793d4cca6022ca41b70ab9daa (diff) | |
| download | frameworks_native-aaa27fd5a0bb81ac17c25c33beb2656b32100cd6.zip frameworks_native-aaa27fd5a0bb81ac17c25c33beb2656b32100cd6.tar.gz frameworks_native-aaa27fd5a0bb81ac17c25c33beb2656b32100cd6.tar.bz2 | |
Merge "Use reinterpret_cast when an integer is cast to a pointer"
Diffstat (limited to 'opengl/tools/glgen/stubs/gles11/common.cpp')
| -rw-r--r-- | opengl/tools/glgen/stubs/gles11/common.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tools/glgen/stubs/gles11/common.cpp b/opengl/tools/glgen/stubs/gles11/common.cpp index 75b75cb..c5a7a24 100644 --- a/opengl/tools/glgen/stubs/gles11/common.cpp +++ b/opengl/tools/glgen/stubs/gles11/common.cpp @@ -89,7 +89,7 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o getBasePointerID, buffer); if (pointer != 0L) { *array = NULL; - return (void *) (jint) pointer; + return reinterpret_cast<void*>(pointer); } *array = (jarray) _env->CallStaticObjectMethod(nioAccessClass, |