OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42af278
)
Fix -Werror on 64-bit builds
author
Dan Stoza
<stoza@google.com>
Mon, 1 Dec 2014 23:15:31 +0000
(15:15 -0800)
committer
Dan Albert
<danalbert@google.com>
Fri, 5 Dec 2014 02:06:48 +0000
(18:06 -0800)
Add another static_cast to avoid an error on 64-bit builds
Change-Id: I62fb2c67766c4aab70d9d1834f255d06ff82dd8d
(cherry picked from commit
116c7a113cb2db4d3f7708627ac4713c7e92cd43
)
libs/ui/GraphicBuffer.cpp
patch
|
blob
|
history
diff --git
a/libs/ui/GraphicBuffer.cpp
b/libs/ui/GraphicBuffer.cpp
index
825baf4
..
425df38
100644
(file)
--- 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()