#5078 Replace boost::assign usage with modern c++ brace initialization

Signed-off-by: Rye <rye@alchemyviewer.org>

3 files changed, 19 insertions, 30 deletions

diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index dde0c18580..0734b12531 100644
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -32,7 +32,6 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
 #include <boost/tokenizer.hpp>
-#include <boost/assign/list_of.hpp>
 
 #include "llsdserialize.h"
 #include "llerror.h"
@@ -61,14 +60,7 @@ 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 = { "help", "set", "setdefault", "settings", "sessionsettings", "usersessionsettings" };
 
     po::options_description gOptionsDesc;
     po::positional_options_description gPositionalOptions;
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index ba54d93c75..1bffe34b8f 100644
--- 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"
@@ -184,15 +183,15 @@ void LLFeatureList::dump()
     }
 }
 
-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 = {
+    "Low",
+    "LowMid",
+    "Mid",
+    "MidHigh",
+    "High",
+    "HighUltra",
+    "Ultra"
+};
 
 U32 LLFeatureManager::getMaxGraphicsLevel() const
 {
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index afd58af056..84455bb679 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -26,8 +26,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include <boost/assign/list_of.hpp>
-
 #include "llpresetsmanager.h"
 
 #include "lldiriterator.h"
@@ -250,17 +248,17 @@ void LLPresetsManager::settingChanged()
 
 void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 {
-    const std::vector<std::string> camera_controls = boost::assign::list_of
+    const std::vector<std::string> camera_controls = {
         // From panel_preferences_move.xml
-        ("CameraAngle")
-        ("CameraOffsetScale")
+        "CameraAngle",
+        "CameraOffsetScale",
         // From llagentcamera.cpp
-        ("CameraOffsetBuild")
-        ("TrackFocusObject")
-        ("CameraOffsetRearView")
-        ("FocusOffsetRearView")
-        ("AvatarSitRotation")
-        ;
+        "CameraOffsetBuild",
+        "TrackFocusObject",
+        "CameraOffsetRearView",
+        "FocusOffsetRearView",
+        "AvatarSitRotation",
+    };
     names = camera_controls;
 }