diff options
| author | Nico Weber <thakis@chromium.org> | 2015-12-30 17:39:09 -0500 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-12-30 22:40:10 +0000 |
| commit | 3ff31966063c8aa17d813c20592b198a59713333 (patch) | |
| tree | e58ad0fcba81c3fb0b00c177511bb58f5bb37aa6 | |
| parent | d31a44fa1ce9dca3c6a1e4365e150dd3b0a23248 (diff) | |
| download | chromium_src-3ff31966063c8aa17d813c20592b198a59713333.zip chromium_src-3ff31966063c8aa17d813c20592b198a59713333.tar.gz chromium_src-3ff31966063c8aa17d813c20592b198a59713333.tar.bz2 | |
Try to fix msan bot after libc++ roll.
Should fix:
../../buildtools/third_party/libc++/trunk/include/map:843:5: error: static_assert failed
"Allocator::value_type must be same type as value_type"
static_assert((is_same<typename allocator_type::value_type, value_type>::value),
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../components/metrics/leak_detector/leak_analyzer.h:69:55: note: requested here
Allocator<std::pair<ValueType, uint32_t>>> suspected_histogram_;
BUG=573250
Review URL: https://codereview.chromium.org/1557663002 .
Cr-Commit-Position: refs/heads/master@{#367196}
| -rw-r--r-- | components/metrics/leak_detector/leak_analyzer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/metrics/leak_detector/leak_analyzer.h b/components/metrics/leak_detector/leak_analyzer.h index 167aa71..bf98c6c 100644 --- a/components/metrics/leak_detector/leak_analyzer.h +++ b/components/metrics/leak_detector/leak_analyzer.h @@ -66,7 +66,8 @@ class LeakAnalyzer { std::map<ValueType, uint32_t, std::less<ValueType>, - Allocator<std::pair<ValueType, uint32_t>>> suspected_histogram_; + Allocator<std::pair<const ValueType, uint32_t>>> + suspected_histogram_; // Array of allocated values that passed the suspicion threshold and are being // reported. |