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/src | |
| 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/src')
| -rw-r--r-- | opengl/tools/glgen/src/JniCodeEmitter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/opengl/tools/glgen/src/JniCodeEmitter.java b/opengl/tools/glgen/src/JniCodeEmitter.java index b1bd1fd..e51b7a2 100644 --- a/opengl/tools/glgen/src/JniCodeEmitter.java +++ b/opengl/tools/glgen/src/JniCodeEmitter.java @@ -1283,7 +1283,7 @@ public class JniCodeEmitter { for (int i = 0; i < numArgs; i++) { String typecast; if (i == numArgs - 1 && isPointerOffsetFunc) { - typecast = "(GLvoid *)"; + typecast = "reinterpret_cast<GLvoid *>"; } else { typecast = "(" + cfunc.getArgType(i).getDeclaration() + ")"; } @@ -1297,6 +1297,8 @@ public class JniCodeEmitter { if (cfunc.getArgType(i).isEGLHandle() && !cfunc.getArgType(i).isPointer()){ out.print(cfunc.getArgName(i)+"_native"); + } else if (i == numArgs - 1 && isPointerOffsetFunc){ + out.print("("+cfunc.getArgName(i)+")"); } else { out.print(cfunc.getArgName(i)); } |