diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index e20bd81ab3..cb740a00f1 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -147,15 +147,15 @@ QString getCollisionGroupAsString(uint8_t group) { } uint8_t getCollisionGroupAsBitMask(const QStringRef& name) { - if (0 == name.compare("dynamic")) { + if (0 == name.compare(QString("dynamic"))) { return USER_COLLISION_GROUP_DYNAMIC; - } else if (0 == name.compare("static")) { + } else if (0 == name.compare(QString("static"))) { return USER_COLLISION_GROUP_STATIC; - } else if (0 == name.compare("kinematic")) { + } else if (0 == name.compare(QString("kinematic"))) { return USER_COLLISION_GROUP_KINEMATIC; - } else if (0 == name.compare("myAvatar")) { + } else if (0 == name.compare(QString("myAvatar"))) { return USER_COLLISION_GROUP_MY_AVATAR; - } else if (0 == name.compare("otherAvatar")) { + } else if (0 == name.compare(QString("otherAvatar"))) { return USER_COLLISION_GROUP_OTHER_AVATAR; } return 0; diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index 287c15e3a2..26483388e5 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -26,6 +26,15 @@ #include #include "CPUIdent.h" #include + +#if _MSC_VER >= 1900 +#pragma comment(lib, "legacy_stdio_definitions.lib") +FILE _iob[] = {*stdin, *stdout, *stderr}; +extern "C" FILE * __cdecl __iob_func(void) { + return _iob; +} +#endif + #endif diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp index e798969268..f52ba78724 100644 --- a/tests/render-perf/src/main.cpp +++ b/tests/render-perf/src/main.cpp @@ -1086,7 +1086,7 @@ private: QSize _size; QSettings _settings; - std::atomic _renderCount; + std::atomic _renderCount{ 0 }; gl::OffscreenContext _initContext; RenderThread _renderThread; QWindowCamera _camera; @@ -1152,3 +1152,4 @@ int main(int argc, char** argv) { } #include "main.moc" +