From 5374c56e5196320681993869e3126b51edac2a43 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 10 Sep 2019 13:50:52 -0700 Subject: Export of internal Abseil changes -- 62de74cdadc450a28eaa61a2db0912c97c8004dd by Abseil Team : Move "internal/flag.*" files to the "internal" build target. PiperOrigin-RevId: 268301646 -- 72cd87aebd52fa7e7ee7cff0284f3761dd490945 by CJ Johnson : Silences incorrect test failure for InlinedVector in MSVC debug mode. PiperOrigin-RevId: 268234003 GitOrigin-RevId: 62de74cdadc450a28eaa61a2db0912c97c8004dd Change-Id: I6b58e41561de6ac2e34cf5c1eedbf535dc468955 --- absl/container/inlined_vector_test.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'absl/container/inlined_vector_test.cc') diff --git a/absl/container/inlined_vector_test.cc b/absl/container/inlined_vector_test.cc index bada4fec9ccb..080ea95665d5 100644 --- a/absl/container/inlined_vector_test.cc +++ b/absl/container/inlined_vector_test.cc @@ -1689,7 +1689,11 @@ TEST(AllocatorSupportTest, ScopedAllocatorWorksInlined) { inlined_case.emplace_back(); int64_t absl_responsible_for_count = total_allocated_byte_count; + + // MSVC's allocator preemptively allocates in debug mode +#if !defined(_MSC_VER) EXPECT_EQ(absl_responsible_for_count, 0); +#endif // !defined(_MSC_VER) inlined_case[0].emplace_back(); EXPECT_GT(total_allocated_byte_count, absl_responsible_for_count); -- cgit 1.4.1