summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-27 11:11:53 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-27 11:11:53 -0400
commit2159da95e0acc15daa7ab18bc17f1d5f60be71cc (patch)
tree6be71fb5c29e11ca979e58e55314fd39499b2b85 /indra
parent5000f8bd123a87ffbc321a7e3fed61221c9a4da1 (diff)
DRTVWR-587: Try harder to work around clang bug.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/lazyeventapi.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lazyeventapi.h b/indra/llcommon/lazyeventapi.h
index cc566e35af..e36831270b 100644
--- a/indra/llcommon/lazyeventapi.h
+++ b/indra/llcommon/lazyeventapi.h
@@ -77,12 +77,13 @@ namespace LL
// https://github.com/llvm/llvm-project/issues/41999
auto func{ &LazyEventAPIBase::add_trampoline
<const std::string&, const std::string&, ARGS...> };
-
// We can't bind an unexpanded parameter pack into a lambda --
// shame really. Instead, capture all our args as a std::tuple and
// then, in the lambda, use apply() to pass to add_trampoline().
+ auto args{ std::make_tuple(name, desc, std::forward<ARGS>(rest)...) };
+
mParams.init.connect_extended(
- [func, args = std::make_tuple(name, desc, std::forward<ARGS>(rest)...)]
+ [func, args]
(const boost::signals2::connection& conn, LLEventAPI* instance)
{
// we only need this connection once