diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-12-05 23:01:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-05 23:01:47 +0000 |
| commit | e725faa186ff916ff7b3fb7d04f7026773498580 (patch) | |
| tree | ae669c66a2afb3944046fe24629a992a4de106b9 /libs/vr | |
| parent | bf01f66de5fa5f713ab71d3cfd2e1d5e27e722d7 (diff) | |
| parent | 7553b18b49ed839f4183b0c8d915c23d74769709 (diff) | |
| download | native-e725faa186ff916ff7b3fb7d04f7026773498580.tar.gz | |
Merge "Fix clang compiler warnings."
am: 7553b18b49
Change-Id: I60abdc7bbde7008a0b058495febd6f3d3bf75031
Diffstat (limited to 'libs/vr')
| -rw-r--r-- | libs/vr/libdvr/tests/dvr_named_buffer-test.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/vr/libdvr/tests/dvr_named_buffer-test.cpp b/libs/vr/libdvr/tests/dvr_named_buffer-test.cpp index c21deb0d0e..5c837e74ea 100644 --- a/libs/vr/libdvr/tests/dvr_named_buffer-test.cpp +++ b/libs/vr/libdvr/tests/dvr_named_buffer-test.cpp @@ -5,7 +5,6 @@ #include <dvr/dvr_surface.h> #include <system/graphics.h> -#include <base/logging.h> #include <gtest/gtest.h> namespace android { @@ -22,7 +21,7 @@ TEST(DvrGlobalBufferTest, TestGlobalBuffersSameName) { DvrBuffer* buffer2 = nullptr; int ret2 = dvrSetupGlobalBuffer(buffer_key, 10, 0, &buffer2); - ASSERT_EQ(0, ret1); + ASSERT_EQ(0, ret2); ASSERT_NE(nullptr, buffer2); AHardwareBuffer* hardware_buffer1 = nullptr; @@ -159,7 +158,7 @@ TEST(DvrGlobalBufferTest, TestGlobalBufferCarriesData) { ASSERT_EQ(0, e3); ASSERT_NE(nullptr, buffer); // Verify that the buffer pointer is at least 16 byte aligned. - ASSERT_EQ(0, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); + ASSERT_EQ(0U, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); uint64_t* data = static_cast<uint64_t*>(buffer); constexpr size_t num_values = size / sizeof(uint64_t); @@ -192,7 +191,7 @@ TEST(DvrGlobalBufferTest, TestGlobalBufferCarriesData) { ASSERT_EQ(0, e3); ASSERT_NE(nullptr, buffer); // Verify that the buffer pointer is at least 16 byte aligned. - ASSERT_EQ(0, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); + ASSERT_EQ(0U, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); uint64_t* data = static_cast<uint64_t*>(buffer); constexpr size_t num_values = size / sizeof(uint64_t); @@ -233,7 +232,7 @@ TEST(DvrGlobalBufferTest, TestGlobalBufferZeroed) { ASSERT_EQ(0, e3); ASSERT_NE(nullptr, buffer); // Verify that the buffer pointer is at least 16 byte aligned. - ASSERT_EQ(0, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); + ASSERT_EQ(0U, reinterpret_cast<uintptr_t>(buffer) & (16 - 1)); uint64_t* data = static_cast<uint64_t*>(buffer); constexpr size_t num_values = size / sizeof(uint64_t); @@ -241,7 +240,7 @@ TEST(DvrGlobalBufferTest, TestGlobalBufferZeroed) { for (size_t i = 0; i < num_values; ++i) { zero |= data[i]; } - ASSERT_EQ(0, zero); + ASSERT_EQ(0U, zero); int32_t fence = -1; int e4 = AHardwareBuffer_unlock(hardware_buffer, &fence); |