| commit | 09b9193d10b3849e426c5370a757a0eedc65a7ff | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Dec 05 17:48:53 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 05 17:48:53 2014 +0000 |
| tree | 6ae1eb107bd6d8f4273b5d8631afecad49728ff9 | |
| parent | 67df03d054f0cc4bd0e47066642b791198e9b0ad [diff] | |
| parent | 133caacf87423a738f31b6e1f58d0abcb377058d [diff] |
Merge "Fix -Werror on 64-bit builds"
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 @@ } status_t GraphicBuffer::initCheck() const { - return mInitCheck; + return static_cast<status_t>(mInitCheck); } void GraphicBuffer::dumpAllocationsToSystemLog()