Commit 3a5455b3 authored by Bo Yang's avatar Bo Yang

uint64 has non-trivial destructor on 32-bit windows. This cause arena

allocator to allocate memory twice for uint64.
parent cdd5b3b8
......@@ -1232,11 +1232,11 @@ TEST(ArenaTest, ArenaHooksSanity) {
EXPECT_EQ(1, ArenaHooksTestUtil::num_init);
EXPECT_EQ(0, ArenaHooksTestUtil::num_allocations);
::google::protobuf::Arena::Create<uint64>(&arena);
#ifdef _WIN32
EXPECT_EQ(2, ArenaHooksTestUtil::num_allocations);
#else
EXPECT_EQ(1, ArenaHooksTestUtil::num_allocations);
#endif
if (::google::protobuf::internal::has_trivial_destructor<uint64>::value) {
EXPECT_EQ(1, ArenaHooksTestUtil::num_allocations);
} else {
EXPECT_EQ(2, ArenaHooksTestUtil::num_allocations);
}
arena.Reset();
arena.Reset();
EXPECT_EQ(2, ArenaHooksTestUtil::num_reset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment