From 36d5dfc0ceee9643e1fa825b36dac66a8c5c8f7c Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Thu, 3 Oct 2019 01:08:18 -0400
Subject: [PATCH] Fix some warnings and build errors
---
indra/llmessage/llmessageprecompiled.h | 3 ++-
indra/llrender/llfontregistry.cpp | 2 +-
indra/newview/alchatcommand.cpp | 2 +-
indra/newview/llappviewer.cpp | 4 ++--
indra/newview/llfasttimerview.cpp | 4 ++--
indra/newview/llfeaturemanager.cpp | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/indra/llmessage/llmessageprecompiled.h b/indra/llmessage/llmessageprecompiled.h
index d2ce7fab83..3aef589ac5 100644
--- a/indra/llmessage/llmessageprecompiled.h
+++ b/indra/llmessage/llmessageprecompiled.h
@@ -39,4 +39,5 @@
#include "llstl.h"
#include "lltimer.h"
-#endif // LL_LLMESSAGEPRECOMPILED_H
\ No newline at end of file
+#endif // LL_LLMESSAGEPRECOMPILED_H
+
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index c0715c3108..32f3135725 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -463,7 +463,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
font_paths.push_back(local_path + file_name);
font_paths.push_back(sys_path + file_name);
#if LL_DARWIN
- font_paths.push_back(MACOSX_FONT_PATH_LIBRARY + *file_name_it);
+ font_paths.push_back(MACOSX_FONT_PATH_LIBRARY + file_name);
#endif
bool is_ft_collection = (std::find(ft_collection_list.begin(), ft_collection_list.end(), file_name) != ft_collection_list.end());
diff --git a/indra/newview/alchatcommand.cpp b/indra/newview/alchatcommand.cpp
index 3825b0878b..75e94ecbf5 100644
--- a/indra/newview/alchatcommand.cpp
+++ b/indra/newview/alchatcommand.cpp
@@ -289,7 +289,7 @@ bool ALChatCommand::parseCommand(std::string data)
LLVOAvatar* avatarp = (LLVOAvatar*)object;
if (avatarp)
{
- for (const std::pair<LLUUID, S32>& playpair : avatarp->mPlayingAnimations)
+ for (const std::pair<LLUUID, S32> playpair : avatarp->mPlayingAnimations)
{
avatarp->stopMotion(playpair.first, TRUE);
avatarp->startMotion(playpair.first);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e858ec0f0c..8872009c10 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1190,7 +1190,7 @@ bool LLAppViewer::init()
LLSD item(LeapCommand);
LeapCommand.append(item);
}
- for (const std::string& leap : llsd::inArray(LeapCommand))
+ for (const LLSD& leap : llsd::inArray(LeapCommand))
{
LL_INFOS("InitInfo") << "processing --leap \"" << leap << '"' << LL_ENDL;
// We don't have any better description of this plugin than the
@@ -1199,7 +1199,7 @@ bool LLAppViewer::init()
// Suppress LLLeap::Error exception: trust LLLeap's own logging. We
// don't consider any one --leap command mission-critical, so if one
// fails, log it, shrug and carry on.
- LLLeap::create("", leap, false); // exception=false
+ LLLeap::create("", leap.asString(), false); // exception=false
}
if (gSavedSettings.getBOOL("QAMode") && gSavedSettings.getS32("QAModeEventHostPort") > 0)
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 339fa62c60..c95063b9d0 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -734,7 +734,7 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
last_p.clear();
- for (std::_Vector_iterator<std::_Vector_val<std::_Simple_types<double>>>::value_type& iter : base_execution)
+ for (const F64 iter : base_execution)
{
gGL.begin(LLRender::TRIANGLE_STRIP);
gGL.vertex3fv(last_p.mV);
@@ -754,7 +754,7 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
count = 0;
total_count = cur_execution.size();
- for (std::_Vector_iterator<std::_Vector_val<std::_Simple_types<double>>>::value_type& iter : cur_execution)
+ for (const F64 iter : cur_execution)
{
gGL.begin(LLRender::TRIANGLE_STRIP);
gGL.vertex3f(last_p.mV[0], 0.f, 0.f);
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 7cc6cc6922..24bce69b11 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -730,7 +730,7 @@ void LLFeatureManager::applyBaseMasks()
// now mask by gpu string
// Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces
std::string gpustr = mGPUString;
- for (std::_String_iterator<std::_String_val<std::_Simple_types<char>>>::value_type& iter : gpustr)
+ for (std::string::value_type& iter : gpustr)
{
if (iter == ' ')
{
--
GitLab