From 0b7af66016ca3a8c8753447726bcc00f0b47aec4 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 2 Oct 2017 15:38:59 -0700 Subject: [PATCH] more linux warnings --- libraries/entities/src/EntityItem.cpp | 2 +- libraries/entities/src/EntityScriptingInterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 6ea0cd0bc7..a1b7ff54de 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1577,7 +1577,7 @@ float EntityItem::getRadius() const { // Checking Certifiable Properties #define ADD_STRING_PROPERTY(n, N) if (!propertySet.get##N().isEmpty()) json[#n] = propertySet.get##N() #define ADD_ENUM_PROPERTY(n, N) json[#n] = propertySet.get##N##AsString() -#define ADD_INT_PROPERTY(n, N) if (propertySet.get##N() != 0) json[#n] = (propertySet.get##N() == -1) ? -1.0 : ((double) propertySet.get##N()) +#define ADD_INT_PROPERTY(n, N) if (propertySet.get##N() != 0) json[#n] = (propertySet.get##N() == (quint32) -1) ? -1.0 : ((double) propertySet.get##N()) QByteArray EntityItem::getStaticCertificateJSON() const { // Produce a compact json of every non-default static certificate property, with the property names in alphabetical order. // The static certificate properties include all an only those properties that cannot be changed without altering the identity diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 06eea6c5ed..2ee2ce9b21 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -1767,7 +1767,7 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI } bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& entityID) { - bool result; + bool result = false; if (_entityTree) { _entityTree->withReadLock([&] { EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID)); @@ -1781,7 +1781,7 @@ bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& en #ifdef DEBUG_CERT QString EntityScriptingInterface::computeCertificateID(const QUuid& entityID) { - QString result; + QString result = false; if (_entityTree) { _entityTree->withReadLock([&] { EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));