diff options
| author | 2017-12-12 14:29:00 -0800 | |
|---|---|---|
| committer | 2017-12-12 14:31:45 -0800 | |
| commit | e3941b20938e6184ad04bfcd791c1c3a1ad42766 (patch) | |
| tree | 04bd0405813e702013280618436b249879d97626 | |
| parent | f02c8b410ab8d83907cfa88a49085c8ac63f88a3 (diff) | |
Fix compiler warnings.
* EXPECT_EQ arguments must be both signed or both unsigned.
Merged-In: I18ed32862bbee207e2751139599eff4f6f6e8618
Test: normal build
Change-Id: I9e03a3457e09a23371227286eaf7744738721352
| -rw-r--r-- | libs/vr/libbufferhub/bufferhub_tests.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/vr/libbufferhub/bufferhub_tests.cpp b/libs/vr/libbufferhub/bufferhub_tests.cpp index c4b9a8c88d..d0d3a73574 100644 --- a/libs/vr/libbufferhub/bufferhub_tests.cpp +++ b/libs/vr/libbufferhub/bufferhub_tests.cpp @@ -46,17 +46,17 @@ TEST_F(LibBufferHubTest, TestBasicUsage) { // Producer state mask is unique, i.e. 1. EXPECT_EQ(p->buffer_state_bit(), kProducerStateBit); // Consumer state mask cannot have producer bit on. - EXPECT_EQ(c->buffer_state_bit() & kProducerStateBit, 0); + EXPECT_EQ(c->buffer_state_bit() & kProducerStateBit, 0ULL); // Consumer state mask must be a single, i.e. power of 2. - EXPECT_NE(c->buffer_state_bit(), 0); - EXPECT_EQ(c->buffer_state_bit() & (c->buffer_state_bit() - 1), 0); + EXPECT_NE(c->buffer_state_bit(), 0ULL); + EXPECT_EQ(c->buffer_state_bit() & (c->buffer_state_bit() - 1), 0ULL); // Consumer state mask cannot have producer bit on. - EXPECT_EQ(c2->buffer_state_bit() & kProducerStateBit, 0); + EXPECT_EQ(c2->buffer_state_bit() & kProducerStateBit, 0ULL); // Consumer state mask must be a single, i.e. power of 2. - EXPECT_NE(c2->buffer_state_bit(), 0); - EXPECT_EQ(c2->buffer_state_bit() & (c2->buffer_state_bit() - 1), 0); + EXPECT_NE(c2->buffer_state_bit(), 0ULL); + EXPECT_EQ(c2->buffer_state_bit() & (c2->buffer_state_bit() - 1), 0ULL); // Each consumer should have unique bit. - EXPECT_EQ(c->buffer_state_bit() & c2->buffer_state_bit(), 0); + EXPECT_EQ(c->buffer_state_bit() & c2->buffer_state_bit(), 0ULL); // Initial state: producer not available, consumers not available. EXPECT_EQ(0, RETRY_EINTR(p->Poll(100))); @@ -166,7 +166,7 @@ TEST_F(LibBufferHubTest, TestStateMask) { cs[i] = BufferConsumer::Import(p->CreateConsumer()); ASSERT_TRUE(cs[i].get() != nullptr); // Expect all buffers have unique state mask. - EXPECT_EQ(buffer_state_bits & cs[i]->buffer_state_bit(), 0); + EXPECT_EQ(buffer_state_bits & cs[i]->buffer_state_bit(), 0ULL); buffer_state_bits |= cs[i]->buffer_state_bit(); } EXPECT_EQ(buffer_state_bits, kProducerStateBit | kConsumerStateMask); @@ -182,7 +182,7 @@ TEST_F(LibBufferHubTest, TestStateMask) { cs[i] = BufferConsumer::Import(p->CreateConsumer()); ASSERT_TRUE(cs[i].get() != nullptr); // The released state mask will be reused. - EXPECT_EQ(buffer_state_bits & cs[i]->buffer_state_bit(), 0); + EXPECT_EQ(buffer_state_bits & cs[i]->buffer_state_bit(), 0ULL); buffer_state_bits |= cs[i]->buffer_state_bit(); EXPECT_EQ(buffer_state_bits, kProducerStateBit | kConsumerStateMask); } |