From 0a014776b3361cf6b7126f50f9e7d2f2b2eb04a5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 24 Jul 2023 17:08:51 -0400
Subject: [PATCH] DRTVWR-587: Pacify VS 2022 specifically.
---
indra/llcommon/lleventdispatcher.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
index 939e3730e10..6c7338efb93 100644
--- a/indra/llcommon/lleventdispatcher.h
+++ b/indra/llcommon/lleventdispatcher.h
@@ -478,8 +478,10 @@ class LL_COMMON_API LLEventDispatcher
LLSD callFail(ARGS&&... args) const
{
mParent->callFail<LLEventDispatcher::DispatchError>(std::forward<ARGS>(args)...);
+#if _MSC_VER < 1930 // pre VS 2022
// pacify the compiler
return {};
+#endif // pre VS 2022
}
};
typedef std::map<std::string, std::unique_ptr<DispatchEntry> > DispatchMap;
--
GitLab