diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-04-07 10:34:50 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-04-11 13:22:19 +0000 |
| commit | 8c647adb6adbbc53a34f62a3e49f9b904786543d (patch) | |
| tree | 17c8473d67078d6a66d39074d50d6d800ea1e871 | |
| parent | f0151b67cfa35fdade501706aac9523e18b14228 (diff) | |
| download | qtwebengine-chromium-8c647adb6adbbc53a34f62a3e49f9b904786543d.tar.gz | |
FIXUP: Fixes for building with MSVC
Add missing CR_EXPAND_ARG().
Fixes Windows assert:
[10320:8936:0406/165557.278:FATAL:histogram.cc(828)] Check failed: valid_arguments.
Change-Id: Ifa162213bc8f98ae110629636b5779a54600a0c1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/base/metrics/histogram_macros.h | 11 | ||||
| -rw-r--r-- | chromium/base/metrics/histogram_macros_local.h | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/chromium/base/metrics/histogram_macros.h b/chromium/base/metrics/histogram_macros.h index e253d7b7ef8..478880d564a 100644 --- a/chromium/base/metrics/histogram_macros.h +++ b/chromium/base/metrics/histogram_macros.h @@ -10,6 +10,10 @@ #include "base/metrics/histogram_macros_local.h" #include "base/time/time.h" +#ifndef CR_EXPAND_ARG +#define CR_EXPAND_ARG(x) x +#endif + // Macros for efficient use of histograms. // @@ -75,10 +79,10 @@ // enum to an arithmetic type and adding one. Instead, prefer the two argument // version of the macro which automatically deduces the boundary from kMaxValue. #define UMA_HISTOGRAM_ENUMERATION(name, ...) \ - INTERNAL_UMA_HISTOGRAM_ENUMERATION_GET_MACRO( \ + CR_EXPAND_ARG(INTERNAL_UMA_HISTOGRAM_ENUMERATION_GET_MACRO( \ __VA_ARGS__, INTERNAL_UMA_HISTOGRAM_ENUMERATION_SPECIFY_BOUNDARY, \ INTERNAL_UMA_HISTOGRAM_ENUMERATION_DEDUCE_BOUNDARY) \ - (name, __VA_ARGS__, base::HistogramBase::kUmaTargetedHistogramFlag) + (name, __VA_ARGS__, base::HistogramBase::kUmaTargetedHistogramFlag)) // As above but "scaled" count to avoid overflows caused by increments of // large amounts. See UMA_HISTOGRAM_SCALED_EXACT_LINEAR for more information. @@ -340,9 +344,6 @@ enum class ScopedHistogramTiming { // All of these macros must be called with |name| as a runtime constant. // For details on usage, see the documentation on the non-stability equivalents. -#ifndef CR_EXPAND_ARG -#define CR_EXPAND_ARG(x) x -#endif #define UMA_STABILITY_HISTOGRAM_BOOLEAN(name, sample) \ STATIC_HISTOGRAM_POINTER_BLOCK( \ diff --git a/chromium/base/metrics/histogram_macros_local.h b/chromium/base/metrics/histogram_macros_local.h index 74ebd0a73f5..951b9c26084 100644 --- a/chromium/base/metrics/histogram_macros_local.h +++ b/chromium/base/metrics/histogram_macros_local.h @@ -22,10 +22,10 @@ // For usage details, see the equivalents in histogram_macros.h. #define LOCAL_HISTOGRAM_ENUMERATION(name, ...) \ - INTERNAL_UMA_HISTOGRAM_ENUMERATION_GET_MACRO( \ + CR_EXPAND_ARG(INTERNAL_UMA_HISTOGRAM_ENUMERATION_GET_MACRO( \ __VA_ARGS__, INTERNAL_UMA_HISTOGRAM_ENUMERATION_SPECIFY_BOUNDARY, \ INTERNAL_UMA_HISTOGRAM_ENUMERATION_DEDUCE_BOUNDARY) \ - (name, __VA_ARGS__, base::HistogramBase::kNoFlags) + (name, __VA_ARGS__, base::HistogramBase::kNoFlags)) #define LOCAL_HISTOGRAM_BOOLEAN(name, sample) \ STATIC_HISTOGRAM_POINTER_BLOCK(name, AddBoolean(sample), \ |