organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

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

Browse source 
allocator to allocate memory twice for uint64.
This commit is contained in:
Bo Yang 2015-05-26 13:12:16 -07:00
parent cdd5b3b84b
commit 3a5455b34b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/google/protobuf/arena_unittest.cc
View file

@ -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);