summaryrefslogtreecommitdiff
path: root/indra/llcommon
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/llcommon
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/llcommon')
-rw-r--r--indra/llcommon/llstring.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 8d2c8d79d7..30bec3a6f8 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1755,7 +1755,7 @@ bool LLStringUtilBase<T>::endsWith(
template<class T>
auto LLStringUtilBase<T>::getoptenv(const std::string& key) -> boost::optional<string_type>
{
- auto found{llstring_getoptenv(key)};
+ auto found(llstring_getoptenv(key));
if (found)
{
// return populated boost::optional
@@ -1772,7 +1772,7 @@ auto LLStringUtilBase<T>::getoptenv(const std::string& key) -> boost::optional<s
template<class T>
auto LLStringUtilBase<T>::getenv(const std::string& key, const string_type& dflt) -> string_type
{
- auto found{getoptenv(key)};
+ auto found(getoptenv(key));
if (found)
{
return *found;