diff options
| author | 2014-12-08 18:46:08 +0000 | |
|---|---|---|
| committer | 2014-12-08 18:46:08 +0000 | |
| commit | e22262ffd0bbed53e6d964f2fbcd5ecd85c04403 (patch) | |
| tree | dd5b7d0f0fcda5037fdff7024bec79a6b2848498 /libs/gui/BitTube.cpp | |
| parent | 8fd567b127170a3962bc9de637eb7987cee71810 (diff) | |
| parent | dd883c0b08d2a60f89542b9b9f5fdabcb14885c7 (diff) | |
Merge "libgui: Enable -Weverything and -Werror"
Diffstat (limited to 'libs/gui/BitTube.cpp')
| -rw-r--r-- | libs/gui/BitTube.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/BitTube.cpp b/libs/gui/BitTube.cpp index 3ed1f370a5..b653c5b69c 100644 --- a/libs/gui/BitTube.cpp +++ b/libs/gui/BitTube.cpp @@ -149,12 +149,12 @@ ssize_t BitTube::sendObjects(const sp<BitTube>& tube, ssize_t size = tube->write(vaddr, count*objSize); // should never happen because of SOCK_SEQPACKET - LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), + LOG_ALWAYS_FATAL_IF((size >= 0) && (size % static_cast<ssize_t>(objSize)), "BitTube::sendObjects(count=%zu, size=%zu), res=%zd (partial events were sent!)", count, objSize, size); //ALOGE_IF(size<0, "error %d sending %d events", size, count); - return size < 0 ? size : size / objSize; + return size < 0 ? size : size / static_cast<ssize_t>(objSize); } ssize_t BitTube::recvObjects(const sp<BitTube>& tube, @@ -164,12 +164,12 @@ ssize_t BitTube::recvObjects(const sp<BitTube>& tube, ssize_t size = tube->read(vaddr, count*objSize); // should never happen because of SOCK_SEQPACKET - LOG_ALWAYS_FATAL_IF((size >= 0) && (size % objSize), + LOG_ALWAYS_FATAL_IF((size >= 0) && (size % static_cast<ssize_t>(objSize)), "BitTube::recvObjects(count=%zu, size=%zu), res=%zd (partial events were received!)", count, objSize, size); //ALOGE_IF(size<0, "error %d receiving %d events", size, count); - return size < 0 ? size : size / objSize; + return size < 0 ? size : size / static_cast<ssize_t>(objSize); } // ---------------------------------------------------------------------------- |