diff options
| author | 2018-12-18 11:59:48 -0800 | |
|---|---|---|
| committer | 2018-12-18 11:59:48 -0800 | |
| commit | 872cc103ea87d0c96260537b31f1118d2e3ded0b (patch) | |
| tree | c751a3425e355b5b943d2e214d910bd5004fcbd3 | |
| parent | e10b5c6a14f0a42de0305095360b96fae3652cdd (diff) | |
| parent | f2147cf2a9c7a488566c37b96bee727f6d94654a (diff) | |
Merge "Fix -Wsize-comparison failures."
am: f2147cf2a9
Change-Id: I3818d52001f69576d9a918ad29b08915923142e3
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_parcel_utils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h b/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h index fcdf7af22c..f3bc31b0bb 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h @@ -43,7 +43,7 @@ static inline bool AParcel_stdVectorAllocator(void* vectorData, int32_t length, if (length < 0) return false; std::vector<T>* vec = static_cast<std::vector<T>*>(vectorData); - if (length > vec->max_size()) return false; + if (static_cast<size_t>(length) > vec->max_size()) return false; vec->resize(length); *outBuffer = vec->data(); @@ -65,7 +65,7 @@ static inline bool AParcel_nullableStdVectorAllocator(void* vectorData, int32_t *vec = std::optional<std::vector<T>>(std::vector<T>{}); - if (length > (*vec)->max_size()) return false; + if (static_cast<size_t>(length) > (*vec)->max_size()) return false; (*vec)->resize(length); *outBuffer = (*vec)->data(); @@ -88,7 +88,7 @@ static inline bool AParcel_stdVectorExternalAllocator(void* vectorData, int32_t if (length < 0) return false; std::vector<T>* vec = static_cast<std::vector<T>*>(vectorData); - if (length > vec->max_size()) return false; + if (static_cast<size_t>(length) > vec->max_size()) return false; vec->resize(length); return true; @@ -116,7 +116,7 @@ static inline bool AParcel_nullableStdVectorExternalAllocator(void* vectorData, *vec = std::optional<std::vector<T>>(std::vector<T>{}); - if (length > (*vec)->max_size()) return false; + if (static_cast<size_t>(length) > (*vec)->max_size()) return false; (*vec)->resize(length); return true; |