diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-10-31 17:18:12 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:53 +0100 |
commit | 6a61d723dba4bd8b688028e3b0fdf4540a3ab328 (patch) | |
tree | 03507dc67774b3c2600b8f02d0fc3b13b7e147dd | |
parent | 2d6f5dcfdbdf079b5a10e89934c0dd8a03c37974 (diff) | |
download | qtwebengine-chromium-6a61d723dba4bd8b688028e3b0fdf4540a3ab328.tar.gz |
Fix building with MSVC
The compiler somehow gets confused about which division
operator to use when accessing a bitset.
Output the flags as a simple int, instead of a bitset when building
with MSVC.
Change-Id: Ib95ea5c2da0b3806cb2138454a47825fd7c59c1a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | chromium/third_party/blink/public/common/frame/sandbox_flags.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/third_party/blink/public/common/frame/sandbox_flags.h b/chromium/third_party/blink/public/common/frame/sandbox_flags.h index 4555905f0af..9fca7a4c6e0 100644 --- a/chromium/third_party/blink/public/common/frame/sandbox_flags.h +++ b/chromium/third_party/blink/public/common/frame/sandbox_flags.h @@ -54,7 +54,11 @@ inline constexpr WebSandboxFlags operator~(WebSandboxFlags flags) { } inline std::ostream& operator<<(std::ostream& out, WebSandboxFlags flags) { +#ifndef _MSC_VER return out << std::bitset<sizeof(int) * 8>(static_cast<int>(flags)); +#else + return out << static_cast<int>(flags); +#endif } } // namespace blink |