diff options
| author | Sergio Giro <sgiro@google.com> | 2015-09-23 22:03:30 +0100 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2015-09-23 22:03:30 +0100 |
| commit | 21ca798137c8c065c8cdaa30a08ff05003f3b50f (patch) | |
| tree | 5f4d5774e16fb8e141741afda40601f799b3cbf8 | |
| parent | e8356efcbb658e3c84571b242726caa8fede32d2 (diff) | |
| parent | 8dba9a7bf1322f4cf60509131f13c8eac657ae63 (diff) | |
| download | system_core-21ca798137c8c065c8cdaa30a08ff05003f3b50f.tar.gz system_core-21ca798137c8c065c8cdaa30a08ff05003f3b50f.tar.bz2 system_core-21ca798137c8c065c8cdaa30a08ff05003f3b50f.zip | |
resolved conflicts for 8dba9a7b to master
Change-Id: I314e3fc4dffbff1f7030533a821696692d03b33d
| -rw-r--r-- | libutils/SharedBufferTest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libutils/SharedBufferTest.cpp b/libutils/SharedBufferTest.cpp index 1919e771c..33a4e0c90 100644 --- a/libutils/SharedBufferTest.cpp +++ b/libutils/SharedBufferTest.cpp @@ -14,13 +14,15 @@ * limitations under the License. */ -#include <utils/SharedBuffer.h> +#define __STDC_LIMIT_MACROS #include <gtest/gtest.h> #include <memory> #include <stdint.h> +#include "SharedBuffer.h" + TEST(SharedBufferTest, TestAlloc) { EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX), ""); EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX - sizeof(android::SharedBuffer)), ""); |