From b608c193e17722ed8b0180efff71ba0891c4953c Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Mon, 7 Aug 2017 08:42:12 -0400
Subject: [PATCH] Random changes
---
indra/llcommon/llregistry.h | 4 ++--
indra/llrender/llshadermgr.cpp | 2 +-
indra/llui/lluicolortable.cpp | 2 +-
indra/llui/llview.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
index c3a4c4592a..a7e99c2d09 100644
--- a/indra/llcommon/llregistry.h
+++ b/indra/llcommon/llregistry.h
@@ -59,7 +59,7 @@ public:
bool add(ref_const_key_t key, ref_const_value_t value)
{
- if (mMap.insert(std::make_pair(key, value)).second == false)
+ if (mMap.emplace(key, value).second == false)
{
LL_WARNS() << "Tried to register " << key << " but it was already registered!" << LL_ENDL;
return false;
@@ -91,7 +91,7 @@ public:
ptr_value_t getValue(ref_const_key_t key)
{
typename registry_map_t::iterator found_it = mMap.find(key);
- if (found_it != mMap.end())
+ if (found_it != mMap.cend())
{
return &(found_it->second);
}
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index d0c302de4f..8f8bd8e0aa 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1061,7 +1061,7 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev
if (ret)
{
// Add shader file to map
- mShaderObjects.insert(make_pair(filename, CachedShaderObject(ret, try_gpu_class, type, texture_index_channels, defines)));
+ mShaderObjects.emplace(filename, CachedShaderObject(ret, try_gpu_class, type, texture_index_channels, defines));
shader_level = try_gpu_class;
}
else
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index d891281e3f..4bdef7b122 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -286,7 +286,7 @@ void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, st
}
else
{
- table.insert(string_color_map_t::value_type(name, color));
+ table.emplace(name, color);
}
}
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 109fb45d40..a5e8b9376b 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -206,7 +206,7 @@ BOOL LLView::isPanel() const
void LLView::setToolTip(const LLStringExplicit& msg)
{
// <alchemy>
- if (msg.size())
+ if (!msg.empty())
{
mToolTipMsg = std::make_unique<char[]>(msg.size() + 1);
std::strncpy(mToolTipMsg.get(), msg.c_str(), msg.size() + 1);
--
GitLab