From 5b5eb55f0c999a55cd0df1dd983629967d447b6c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 20 Aug 2019 12:48:21 -0400
Subject: [PATCH] DRTVWR-493: Clarify capturing LLError::getFatalFunction() in
a var.
VS 2013 thought we were storing an initialization-list.
---
indra/llcommon/llsingleton.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp
index 88527a3d313..c45c1445704 100644
--- a/indra/llcommon/llsingleton.cpp
+++ b/indra/llcommon/llsingleton.cpp
@@ -461,7 +461,7 @@ void LLSingletonBase::logerrs(const char* p1, const char* p2, const char* p3, co
// https://www.youtube.com/watch?v=OMG7paGJqhQ (emphasis on OMG)
std::ostringstream out;
out << p1 << p2 << p3 << p4;
- auto crash{ LLError::getFatalFunction() };
+ auto crash = LLError::getFatalFunction();
if (crash)
{
crash(out.str());
--
GitLab