diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-09-20 01:12:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-20 01:12:26 +0000 |
| commit | 742d0173e8bd41e137d175c04860c532270b3f5b (patch) | |
| tree | 25d1bec684f2c97a0f46ddfc69f7ab5f1b52c8f3 | |
| parent | f24699f0f4c7f266f14f1f682aca7ac1a8c2336b (diff) | |
| parent | 661600dd0f0bf48289f69915c6b9844436702a90 (diff) | |
| download | system_core-742d0173e8bd41e137d175c04860c532270b3f5b.zip system_core-742d0173e8bd41e137d175c04860c532270b3f5b.tar.gz system_core-742d0173e8bd41e137d175c04860c532270b3f5b.tar.bz2 | |
am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '661600dd0f0bf48289f69915c6b9844436702a90':
libutils: Fix integer overflows in VectorImpl.
| -rw-r--r-- | libutils/tests/Vector_test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp index 09914bd..96d3168 100644 --- a/libutils/tests/Vector_test.cpp +++ b/libutils/tests/Vector_test.cpp @@ -16,6 +16,8 @@ #define LOG_TAG "Vector_test" +#define __STDC_LIMIT_MACROS +#include <stdint.h> #include <utils/Vector.h> #include <cutils/log.h> #include <gtest/gtest.h> |