From b46a651deef1f8ea1c456d07c8104a717248e9af Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Mar 2013 20:42:36 +0100 Subject: [PATCH] Use boost::unordered_map instead of std::map for blacklisted asset data in asset blacklist --- indra/newview/fswsassetblacklist.cpp | 4 ++-- indra/newview/fswsassetblacklist.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/fswsassetblacklist.cpp b/indra/newview/fswsassetblacklist.cpp index 393b3db14b..633cc370d9 100644 --- a/indra/newview/fswsassetblacklist.cpp +++ b/indra/newview/fswsassetblacklist.cpp @@ -87,7 +87,7 @@ void FSWSAssetBlacklist::addNewItemToBlacklist(const LLUUID& id, const std::stri { LLDate curdate = LLDate(time_corrected()); std::string input_date = curdate.asString(); - input_date.replace(input_date.find("T"),1," "); + input_date.replace(input_date.find("T"), 1, " "); input_date.resize(input_date.size() - 1); LLSD data; @@ -123,7 +123,7 @@ void FSWSAssetBlacklist::addNewItemToBlacklistData(const LLUUID& id, const LLSD& LLAssetType::EType type = S32toAssetType(data["asset_type"].asInteger()); addEntryToBlacklistMap(id, type); - mBlacklistData.insert(std::pair(id, data)); + mBlacklistData[id] = data; if (save) { diff --git a/indra/newview/fswsassetblacklist.h b/indra/newview/fswsassetblacklist.h index 6600d1b9ad..5cbb51c34c 100644 --- a/indra/newview/fswsassetblacklist.h +++ b/indra/newview/fswsassetblacklist.h @@ -28,6 +28,7 @@ #ifndef FS_WSASSETBLACKLIST_H #define FS_WSASSETBLACKLIST_H +#include #include #include "fscommon.h" @@ -37,7 +38,7 @@ typedef boost::unordered_set t_blacklisted_uuid_container; typedef std::map t_blacklist_type_map; -typedef std::map t_blacklist_data; +typedef boost::unordered_map t_blacklist_data; class FSWSAssetBlacklist : public LLSingleton {