summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-27 10:31:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-27 10:31:55 -0400
commitedab599edaf67d37a3a2e954371128676a8cf9cc (patch)
tree6c71f2aa87832944ee0eee612b2d7710bd2fe3a4
parentc406fa7ae97441d1d6e0ea6727c42c8f978fabed (diff)
DRTVWR-587: Revert "Try again to address older clang difficulties."
That wasn't the issue. This is a compiler bug: https://github.com/llvm/llvm-project/issues/41999 https://stackoverflow.com/q/57080425 https://bugs.llvm.org/show_bug.cgi?id=42654 This reverts commit c406fa7ae97441d1d6e0ea6727c42c8f978fabed.
-rw-r--r--indra/llcommon/lazyeventapi.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/lazyeventapi.h b/indra/llcommon/lazyeventapi.h
index 8bedb6fe18..e2dec8f35b 100644
--- a/indra/llcommon/lazyeventapi.h
+++ b/indra/llcommon/lazyeventapi.h
@@ -83,11 +83,10 @@ 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...>,
- full_args);
+ std::tuple_cat(std::make_tuple(instance), args));
});
}