diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
| commit | 4e1c98fe594d99494ce26e94a77f0358705f227c (patch) | |
| tree | a07e9daefa3b5acf716ce89fa1a1c9b500fde795 /absl/container/internal/layout_test.cc | |
| parent | 7a1e14d0d29736ba9c2884d0ce81fc0af92f6ab3 (diff) | |
| parent | b56cbdd23834a65682c0b46f367f8679e83bc894 (diff) | |
Merge new upstream LTS 20200923
Diffstat (limited to 'absl/container/internal/layout_test.cc')
| -rw-r--r-- | absl/container/internal/layout_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/absl/container/internal/layout_test.cc b/absl/container/internal/layout_test.cc index 8f3628a1..757272f1 100644 --- a/absl/container/internal/layout_test.cc +++ b/absl/container/internal/layout_test.cc @@ -17,6 +17,7 @@ // We need ::max_align_t because some libstdc++ versions don't provide // std::max_align_t #include <stddef.h> + #include <cstdint> #include <memory> #include <sstream> @@ -24,6 +25,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "absl/base/config.h" #include "absl/base/internal/raw_logging.h" #include "absl/types/span.h" @@ -1314,7 +1316,7 @@ struct Region { }; void ExpectRegionPoisoned(const unsigned char* p, size_t n, bool poisoned) { -#ifdef ADDRESS_SANITIZER +#ifdef ABSL_HAVE_ADDRESS_SANITIZER for (size_t i = 0; i != n; ++i) { EXPECT_EQ(poisoned, __asan_address_is_poisoned(p + i)); } |