summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-27 09:49:54 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-27 09:49:54 -0400
commitc406fa7ae97441d1d6e0ea6727c42c8f978fabed (patch)
treedf515ddba2028a433964fbfc72644a714abcd0f5 /indra/llcommon
parent35e8d44e17bb53b01ca8c73d3302d08220f5373c (diff)
DRTVWR-587: Try again to address older clang difficulties.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lazyeventapi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/lazyeventapi.h b/indra/llcommon/lazyeventapi.h
index e2dec8f35b..8bedb6fe18 100644
--- a/indra/llcommon/lazyeventapi.h
+++ b/indra/llcommon/lazyeventapi.h
@@ -83,10 +83,11 @@ namespace LL
conn.disconnect();
// apply() expects a tuple specifying ALL the arguments,
// so prepend instance.
+ std::tuple full_args{ std::tuple_cat(std::make_tuple(instance), args) };
// apply() can't accept a template per se; it needs a
// particular specialization.
apply(&LazyEventAPIBase::add_trampoline<const std::string&, const std::string&, ARGS...>,
- std::tuple_cat(std::make_tuple(instance), args));
+ full_args);
});
}