summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-12-15 09:13:24 -0500
committerNat Goodspeed <nat@lindenlab.com>2018-12-15 09:13:24 -0500
commit4a136572857fcf5d5fd21789a777bbde67c1076d (patch)
treeaa5076a08a1b3b090555559de1c81542b86c56b1 /indra/llvfs
parent3c53f8abded5da7e9743b743170538a1ede5635a (diff)
SL-10153: auto name{expression} declares an initializer_list
instead of a variable of type decltype(expression). Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem() requires new Windows #include files. A variable with a constructor can't be declared within the braces of a switch statement, even outside any of its case clauses.
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir_win32.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index acf734f16b..b3b3afb37e 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -54,15 +54,15 @@ namespace
void prelog(const std::string& message)
{
+ boost::optional<std::string> prelog_name;
+
switch (state)
{
- boost::optional<std::string> prelog_name;
-
case prst::INIT:
// assume we failed, until we succeed
state = prst::SKIP;
- prelog_name = LLDirUtil::getoptenv("PRELOG");
+ prelog_name = LLStringUtil::getoptenv("PRELOG");
if (! prelog_name)
// no PRELOG variable set, carry on
return;