From c406fa7ae97441d1d6e0ea6727c42c8f978fabed Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 27 Jul 2023 09:49:54 -0400
Subject: DRTVWR-587: Try again to address older clang difficulties.

---
 indra/llcommon/lazyeventapi.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon')

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);
                 });
         }
 
-- 
cgit v1.2.3