commit c8256867368b9df0b4c58af67c12313a974bb9be
author Yifan Hong <elsk@google.com> Fri Dec 09 19:25:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 09 19:25:14 2016 +0000
tree 9401cc1cc8d6d9d85bd826af10f860a82126b428
parent 4b48edc21b333247a4b48cb12b82ab413040521a
parent 1cfaee704c2d20d6d8d7dedf77bd73f61ee905f7

Merge "Remove explicit cast from Return<*>."

base/include/hidl/HidlSupport.h

diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h
index 0e66ceb..61a8bea 100644
--- a/base/include/hidl/HidlSupport.h
+++ b/base/include/hidl/HidlSupport.h
@@ -423,7 +423,7 @@
     // copy from an array-like object, assuming my resources are freed.
     template <typename Array>
     void copyFrom(const Array &data, size_t size) {
-        mSize = size;
+        mSize = static_cast<uint32_t>(size);
         mOwnsBuffer = true;
         if (mSize > 0) {
             mBuffer = new T[size];