From 1a145aa16de4b3b4ad33f3d2bb3458993520744a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 9 Mar 2020 08:51:34 +0100 Subject: [PATCH] Work around bitset VS2017 and ealrlier compiler bug --- common/UpdateType.cc | 6 ++++++ common/UpdateType.hh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/UpdateType.cc b/common/UpdateType.cc index a8ba358e..8a75ebc3 100644 --- a/common/UpdateType.cc +++ b/common/UpdateType.cc @@ -39,6 +39,12 @@ * * \*===========================================================================*/ +// Workaround compiler bug in VS2017 and earlier with colliding Qt operators and bitset +#ifdef _MSC_VER + #if (_MSC_VER <= 1916) + #define QT_NO_FLOAT16_OPERATORS + #endif +#endif #include "TypesInternal.hh" #include "UpdateType.hh" diff --git a/common/UpdateType.hh b/common/UpdateType.hh index acad7ae0..626f7b57 100644 --- a/common/UpdateType.hh +++ b/common/UpdateType.hh @@ -84,7 +84,7 @@ class DLLEXPORT UpdateType { return os << type.type_; } - protected: + private: UpdateTypeSet type_; }; -- GitLab