summaryrefslogtreecommitdiff
path: root/chromium/base/macros.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-07 17:33:53 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-16 15:20:34 +0100
commit781da29a4693525fbe1bf9b89539da8c194dfebe (patch)
tree32995fb764087479f5550068df3b22749475c49e /chromium/base/macros.h
parent8ce41bd7441697dd132ce4d17f8826f2e755ec23 (diff)
downloadqtwebengine-chromium-781da29a4693525fbe1bf9b89539da8c194dfebe.tar.gz
[Revert] Remove an MSVC-required macro.
We are still building on MSVC Reverts upstream commit b00a9e7e3d434f208e89fb2734a9c78634c2faef Change-Id: If76233faa3ec3ec57f4aaac200a21faef1014cc2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/macros.h')
-rw-r--r--chromium/base/macros.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/base/macros.h b/chromium/base/macros.h
index c67bdbd9870..0962f39129a 100644
--- a/chromium/base/macros.h
+++ b/chromium/base/macros.h
@@ -33,6 +33,10 @@
TypeName() = delete; \
DISALLOW_COPY_AND_ASSIGN(TypeName)
+// Workaround for MSVC, which expands __VA_ARGS__ as one macro argument. To
+// work around this bug, wrap the entire expression in this macro...
+#define CR_EXPAND_ARG(arg) arg
+
// Used to explicitly mark the return value of a function as unused. If you are
// really sure you don't want to do anything with the return value of a function
// that has been marked WARN_UNUSED_RESULT, wrap it with this. Example: