diff options
author | Dan Stoza <stoza@google.com> | 2014-11-11 10:32:31 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-12-04 17:56:17 -0800 |
commit | 01049c8321aab30cd431e2febeddd79242ae5a4f (patch) | |
tree | 7a78d2e8f6d67618779e2c7f16202b87dcec1a02 /include/ui | |
parent | 38803268570f90e97452cd9a30ac831661829091 (diff) | |
download | frameworks_native-01049c8321aab30cd431e2febeddd79242ae5a4f.zip frameworks_native-01049c8321aab30cd431e2febeddd79242ae5a4f.tar.gz frameworks_native-01049c8321aab30cd431e2febeddd79242ae5a4f.tar.bz2 |
Enable clang for libui/libgui/surfaceflinger
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
(cherry picked from commit f10c46ef855b6410b20ebd8b1351d4d78d8eca8e)
Diffstat (limited to 'include/ui')
-rw-r--r-- | include/ui/FramebufferNativeWindow.h | 6 | ||||
-rw-r--r-- | include/ui/GraphicBuffer.h | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 5cd8101..6b66d5f 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -14,11 +14,13 @@ * limitations under the License. */ +#ifndef INCLUDED_FROM_FRAMEBUFFER_NATIVE_WINDOW_CPP +#warning "FramebufferNativeWindow is deprecated" +#endif + #ifndef ANDROID_FRAMEBUFFER_NATIVE_WINDOW_H #define ANDROID_FRAMEBUFFER_NATIVE_WINDOW_H -#warning "FramebufferNativeWindow is deprecated" - #include <stdint.h> #include <sys/types.h> diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 7630faa..4e79ee4 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -72,11 +72,11 @@ public: GraphicBuffer(); // creates w * h buffer - GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage); + GraphicBuffer(int w, int h, PixelFormat format, int usage); // create a buffer from an existing handle - GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage, - uint32_t stride, native_handle_t* handle, bool keepOwnership); + GraphicBuffer(int w, int h, PixelFormat format, int usage, + int stride, native_handle_t* handle, bool keepOwnership); // create a buffer from an existing ANativeWindowBuffer GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership); @@ -84,15 +84,15 @@ public: // return status status_t initCheck() const; - uint32_t getWidth() const { return width; } - uint32_t getHeight() const { return height; } - uint32_t getStride() const { return stride; } - uint32_t getUsage() const { return usage; } + int getWidth() const { return width; } + int getHeight() const { return height; } + int getStride() const { return stride; } + int getUsage() const { return usage; } PixelFormat getPixelFormat() const { return format; } Rect getBounds() const { return Rect(width, height); } uint64_t getId() const { return mId; } - status_t reallocate(uint32_t w, uint32_t h, PixelFormat f, uint32_t usage); + status_t reallocate(int w, int h, PixelFormat f, int usage); status_t lock(uint32_t usage, void** vaddr); status_t lock(uint32_t usage, const Rect& rect, void** vaddr); |