diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-05 17:48:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-05 17:48:53 +0000 |
| commit | 09b9193d10b3849e426c5370a757a0eedc65a7ff (patch) | |
| tree | 6ae1eb107bd6d8f4273b5d8631afecad49728ff9 | |
| parent | 67df03d054f0cc4bd0e47066642b791198e9b0ad (diff) | |
| parent | 133caacf87423a738f31b6e1f58d0abcb377058d (diff) | |
| download | frameworks_native-09b9193d10b3849e426c5370a757a0eedc65a7ff.zip frameworks_native-09b9193d10b3849e426c5370a757a0eedc65a7ff.tar.gz frameworks_native-09b9193d10b3849e426c5370a757a0eedc65a7ff.tar.bz2 | |
Merge "Fix -Werror on 64-bit builds"
| -rw-r--r-- | libs/ui/GraphicBuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index 825baf4..425df38 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -116,7 +116,7 @@ void GraphicBuffer::free_handle() } status_t GraphicBuffer::initCheck() const { - return mInitCheck; + return static_cast<status_t>(mInitCheck); } void GraphicBuffer::dumpAllocationsToSystemLog() |