diff options
| author | Abseil Team <absl-team@google.com> | 2019-09-10T20·50-0700 |
|---|---|---|
| committer | Shaindel Schwartz <shaindel@google.com> | 2019-09-11T14·20-0400 |
| commit | 5374c56e5196320681993869e3126b51edac2a43 (patch) | |
| tree | 8a65ebfaa25cc90c945989938a80f480fe0e111f /absl/container | |
| parent | 97c1664b4bbab5f78fac2b151ab02656268fb34b (diff) | |
Export of internal Abseil changes
-- 62de74cdadc450a28eaa61a2db0912c97c8004dd by Abseil Team <absl-team@google.com>: Move "internal/flag.*" files to the "internal" build target. PiperOrigin-RevId: 268301646 -- 72cd87aebd52fa7e7ee7cff0284f3761dd490945 by CJ Johnson <johnsoncj@google.com>: Silences incorrect test failure for InlinedVector in MSVC debug mode. PiperOrigin-RevId: 268234003 GitOrigin-RevId: 62de74cdadc450a28eaa61a2db0912c97c8004dd Change-Id: I6b58e41561de6ac2e34cf5c1eedbf535dc468955
Diffstat (limited to 'absl/container')
| -rw-r--r-- | absl/container/inlined_vector_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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); |