diff options
author | Dan Albert <danalbert@google.com> | 2016-02-03 00:40:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-03 00:40:03 +0000 |
commit | c312141adc9a5f00b5d13d0980d132d2a8c6f3c9 (patch) | |
tree | 1178142f0e4df20635310dfdd1ce5deee4357a9f | |
parent | 2be113a2489e7d56b21f8ec340198959348012b3 (diff) | |
parent | eacd31f41ef1851bb420c65552b1aed6b74abe29 (diff) | |
download | frameworks_native-c312141adc9a5f00b5d13d0980d132d2a8c6f3c9.zip frameworks_native-c312141adc9a5f00b5d13d0980d132d2a8c6f3c9.tar.gz frameworks_native-c312141adc9a5f00b5d13d0980d132d2a8c6f3c9.tar.bz2 |
Merge "Clean up warnings in EGL."
-rw-r--r-- | opengl/libs/EGL/egl_cache.cpp | 4 | ||||
-rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 2 | ||||
-rw-r--r-- | opengl/libs/EGL/egl_object.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/opengl/libs/EGL/egl_cache.cpp b/opengl/libs/EGL/egl_cache.cpp index b0798a1..f368d75 100644 --- a/opengl/libs/EGL/egl_cache.cpp +++ b/opengl/libs/EGL/egl_cache.cpp @@ -21,6 +21,7 @@ #include "egldefs.h" #include <fcntl.h> +#include <inttypes.h> #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> @@ -306,7 +307,8 @@ void egl_cache_t::loadBlobCacheLocked() { // Sanity check the size before trying to mmap it. size_t fileSize = statBuf.st_size; if (fileSize > maxTotalSize * 2) { - ALOGE("cache file is too large: %#llx", statBuf.st_size); + ALOGE("cache file is too large: %#" PRIx64, + static_cast<off64_t>(statBuf.st_size)); close(fd); return; } diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index ec59235..e81621b 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -286,7 +286,7 @@ EGLBoolean egl_display_t::terminate() { // there are no reference to them, it which case, we're free to // delete them. size_t count = objects.size(); - ALOGW_IF(count, "eglTerminate() called w/ %d objects remaining", count); + ALOGW_IF(count, "eglTerminate() called w/ %zu objects remaining", count); for (size_t i=0 ; i<count ; i++) { egl_object_t* o = objects.itemAt(i); o->destroy(); diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h index f5a9f58..17a8304 100644 --- a/opengl/libs/EGL/egl_object.h +++ b/opengl/libs/EGL/egl_object.h @@ -37,7 +37,7 @@ namespace android { // ---------------------------------------------------------------------------- -struct egl_display_t; +class egl_display_t; class egl_object_t { egl_display_t *display; |