Merge develop into develop-linux

Merge pull request #5316 from RyeMutt/rye/devlinuxupdate

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 5b42c83a14..78101e21af 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -522,7 +522,7 @@ namespace
     }
 
 
-    typedef std::map<std::string, LLError::ELevel> LevelMap;
+    typedef std::unordered_map<std::string, LLError::ELevel> LevelMap;
     typedef std::vector<LLError::RecorderPtr> Recorders;
     typedef std::vector<LLError::CallSite*> CallSiteVector;
 
@@ -543,7 +543,7 @@ namespace
         LevelMap                            mClassLevelMap;
         LevelMap                            mFileLevelMap;
         LevelMap                            mTagLevelMap;
-        std::map<std::string, unsigned int> mUniqueLogMessages;
+        std::unordered_map<std::string, unsigned int> mUniqueLogMessages;
 
         LLError::FatalFunction              mCrashFunction;
         LLError::TimeFunction               mTimeFunction;
@@ -1451,7 +1451,7 @@ namespace LLError
         {
             std::ostringstream message_stream;
 
-            std::map<std::string, unsigned int>::iterator messageIter = s->mUniqueLogMessages.find(message);
+            auto messageIter = s->mUniqueLogMessages.find(message);
             if (messageIter != s->mUniqueLogMessages.end())
             {
                 messageIter->second++;