From dedc14434b47db64b2a8a147c8847934a6596de9 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 10 Dec 2018 15:41:25 -0800 Subject: [PATCH] fix compile warnings on windows --- interface/src/avatar/MyAvatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 9a0787151d..26296355a6 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1261,7 +1261,7 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { // Avatar/avatarEntityData/5/properties: ... // // Create Setting::Handles to mimic this. - uint32_t settingsIndex = _avatarEntityIDSettings.size() + 1; + uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << QString::number(settingsIndex) << "id", QUuid().toString()); @@ -1335,7 +1335,7 @@ void MyAvatar::saveAvatarEntityDataToSettings() { _entitiesToRemoveFromSettings.clear(); }); - uint32_t numEntities = entitiesToSave.size() + _avatarEntityStrings.size(); + uint32_t numEntities = (uint32_t)(entitiesToSave.size() + _avatarEntityStrings.size()); uint32_t prevNumEntities = _avatarEntityCountSetting.get(0); resizeAvatarEntitySettingHandles(std::max(numEntities, prevNumEntities));