diff options
| author | David 'Digit' Turner <digit@android.com> | 2014-01-14 11:57:18 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-01-18 16:56:31 +0100 |
| commit | b81cc7bbd7baa35042af6c6b71edcfe94004bbcd (patch) | |
| tree | 409c961afb25f6768f38f76110dcf4466d39a4ca /emulator/opengl/tests | |
| parent | 4a218a8b31d712290dce83cc65fc0a529fb10823 (diff) | |
| download | sdk-b81cc7bbd7baa35042af6c6b71edcfe94004bbcd.zip sdk-b81cc7bbd7baa35042af6c6b71edcfe94004bbcd.tar.gz sdk-b81cc7bbd7baa35042af6c6b71edcfe94004bbcd.tar.bz2 | |
emulator/opengl: Get rid of all compiler warnings (Linux).
This patch gets rid of all compiler warnings for the
GPU emulation libraries when building on a Linux host.
Note that GLcommon/GLutils.h now provides two new functions
to perform 'safe' type casts between unsigned integers and
pointers: SafePointerFromUInt() and SafeUIntFromPointer().
Change-Id: I01c48bbd72f925d70eb9831f57e15815e687121f
Diffstat (limited to 'emulator/opengl/tests')
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp | 2 | ||||
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp b/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp index 7547cd0..ce65cca 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp +++ b/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp @@ -154,7 +154,7 @@ int main(int argc, char **argv) #ifdef _WIN32 HWND windowId = NULL; #elif __linux__ - Window windowId = NULL; + Window windowId = 0; #elif __APPLE__ void* windowId = NULL; #endif diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp b/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp index 59535c5..732a19a 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp +++ b/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp @@ -372,7 +372,7 @@ int main(int argc, char **argv) #ifdef _WIN32 HWND windowId = NULL; #elif __linux__ - Window windowId = NULL; + Window windowId = 0; #elif __APPLE__ void* windowId = NULL; #endif |