From e676af2bcc63d9d741e34a1a80465c5532edecb4 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Wed, 17 Dec 2014 23:59:05 -0700
Subject: [PATCH] Initialize sets using the standard library, not boost
---
indra/llvfs/lldir.cpp | 8 ++++----
indra/newview/llcommandlineparser.cpp | 17 ++++++++---------
indra/newview/llfeaturemanager.cpp | 19 +++++++++----------
3 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index f6969db477..e52d4243b0 100755
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -707,10 +707,10 @@ std::vector<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
ESkinConstraint constraint) const
{
// Recognize subdirs that have no localization.
- static const std::set<std::string> sUnlocalized = list_of
- ("") // top-level directory not localized
- ("textures") // textures not localized
- ;
+ static const std::set<std::string> sUnlocalized{
+ LLStringUtil::null, // top-level directory not localized
+ LLStringExplicit("textures") // textures not localized
+ };
LL_DEBUGS("LLDir") << "subdir '" << subdir << "', filename '" << filename
<< "', constraint "
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index 06164e9597..b5df25aa5e 100755
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -41,7 +41,6 @@
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp>
#include <boost/tokenizer.hpp>
-#include <boost/assign/list_of.hpp>
#if _MSC_VER
# pragma warning(pop)
@@ -73,14 +72,14 @@ namespace
// List of command-line switches that can't map-to settings variables.
// Going forward, we want every new command-line switch to map-to some
// settings variable. This list is used to validate that.
- const std::set<std::string> unmapped_options = boost::assign::list_of
- ("help")
- ("set")
- ("setdefault")
- ("settings")
- ("sessionsettings")
- ("usersessionsettings")
- ;
+ const std::set<std::string> unmapped_options{
+ LLStringExplicit("help"),
+ LLStringExplicit("set"),
+ LLStringExplicit("setdefault"),
+ LLStringExplicit("settings"),
+ LLStringExplicit("sessionsettings"),
+ LLStringExplicit("usersessionsettings")
+ };
po::options_description gOptionsDesc;
po::positional_options_description gPositionalOptions;
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index ee7f0af7f7..5bb508e998 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -30,7 +30,6 @@
#include <fstream>
#include <boost/regex.hpp>
-#include <boost/assign/list_of.hpp>
#include "llfeaturemanager.h"
#include "lldir.h"
@@ -187,15 +186,15 @@ void LLFeatureList::dump()
LL_DEBUGS("RenderInit") << LL_ENDL;
}
-static const std::vector<std::string> sGraphicsLevelNames = boost::assign::list_of
- ("Low")
- ("LowMid")
- ("Mid")
- ("MidHigh")
- ("High")
- ("HighUltra")
- ("Ultra")
-;
+static const std::vector<std::string> sGraphicsLevelNames{
+ LLStringExplicit("Low"),
+ LLStringExplicit("LowMid"),
+ LLStringExplicit("Mid"),
+ LLStringExplicit("MidHigh"),
+ LLStringExplicit("High"),
+ LLStringExplicit("HighUltra"),
+ LLStringExplicit("Ultra")
+};
U32 LLFeatureManager::getMaxGraphicsLevel() const
{
--
GitLab