diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-14 16:00:09 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-14 16:00:09 -0500 |
commit | 3c53f8abded5da7e9743b743170538a1ede5635a (patch) | |
tree | 44963c81ea8b42e466307304facbd71421a33a93 /indra/llcommon/llstring.h | |
parent | c4096f670c7b3d43f8a5c1f65ef7e02033b0329d (diff) |
SL-10153: VS 2013 isn't so fond of ?: involving std::string.
Diffstat (limited to 'indra/llcommon/llstring.h')
-rw-r--r-- | indra/llcommon/llstring.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 87cb35c59c..8d2c8d79d7 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -1773,7 +1773,14 @@ template<class T> auto LLStringUtilBase<T>::getenv(const std::string& key, const string_type& dflt) -> string_type { auto found{getoptenv(key)}; - return found? *found : dflt; + if (found) + { + return *found; + } + else + { + return dflt; + } } template<class T> |