diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-10-31 17:18:12 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-10-31 17:28:08 +0000 |
commit | d521ec6dd1ed0114b9c6d32b047fb024420a6cda (patch) | |
tree | 03c9342761926255c712eb2b972983c3a17fd971 | |
parent | 4eda1a0881dcff29f464c7069ef0f850e9c76f77 (diff) |
Fix building with MSVCv5.12.0-beta4
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 |