diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-06-20 09:09:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-04 10:20:48 +0200 |
| commit | 3b27f8b97285130d9902afd1a8919428f8ce563d (patch) | |
| tree | a9cad8a2dc3b39a8461c5ee7da5c16beda1a03df | |
| parent | 7e8bc87198846d0012f16e143021ed568c088865 (diff) | |
| download | qtwebengine-chromium-3b27f8b97285130d9902afd1a8919428f8ce563d.tar.gz | |
Fix segfaults with arm 32bit on metrics
Gcc 6 seems to misscompile pair's template constructor
in std::map emplace, use converting move constructor instead.
Task-number: QTBUG-75097
Change-Id: I813175ff9bf69276dc5e0340ce833fa56fada736
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc index 75c4e658a0b..60a87cc43bf 100644 --- a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc +++ b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc @@ -30,7 +30,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default; void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash, int64_t value) { - entry_->metrics.emplace(metric_hash, value); + entry_->metrics.emplace(std::make_pair(metric_hash, value)); } void UkmEntryBuilderBase::Record(UkmRecorder* recorder) { |