diff --git a/common/UpdateType.cc b/common/UpdateType.cc index a8ba358e96f1b153002c25a5a671e203bfb2a8d9..8a75ebc374d6a1c8329e3564df1e3f792f766c6e 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 acad7ae08df85cc16fdd2e53293b355169fba41c..626f7b577982f7adad018ddb75a147c3a8bb8f24 100644 --- a/common/UpdateType.hh +++ b/common/UpdateType.hh @@ -84,7 +84,7 @@ class DLLEXPORT UpdateType { return os << type.type_; } - protected: + private: UpdateTypeSet type_; };