From 3c53f8abded5da7e9743b743170538a1ede5635a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 14 Dec 2018 16:00:09 -0500
Subject: [PATCH] SL-10153: VS 2013 isn't so fond of ?: involving std::string.
---
indra/llcommon/llstring.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 87cb35c59c3..8d2c8d79d75 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>
--
GitLab