summaryrefslogtreecommitdiff
path: root/indra/llcommon/classic_callback.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-09-23 17:09:16 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-09-23 17:09:16 -0400
commit1c3d2876ac2b5212976bde9cd4fdea485a366ab9 (patch)
tree0de111618bc95aa27516d3f76d00e0b9c4631fef /indra/llcommon/classic_callback.h
parent274fc85fcbbe37f491f2d78b8b0f0b4ebb7bba26 (diff)
DRTVWR-543: Consistently use ClassicCallback<USERDATA> throughout.
Diffstat (limited to 'indra/llcommon/classic_callback.h')
-rw-r--r--indra/llcommon/classic_callback.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/classic_callback.h b/indra/llcommon/classic_callback.h
index 76ff9c2339..1ad6dbc58f 100644
--- a/indra/llcommon/classic_callback.h
+++ b/indra/llcommon/classic_callback.h
@@ -167,9 +167,9 @@ protected:
template <typename... Args>
static USERDATA extract_userdata(Args... args)
{
- // Search for the first void* parameter type, then extract that pointer.
+ // Search for the first USERDATA parameter type, then extract that pointer.
// extract value from parameter pack: http://stackoverflow.com/a/24710433/5533635
- return std::get<index_of<0, void*, Args...>::value>(std::forward_as_tuple(args...));
+ return std::get<index_of<0, USERDATA, Args...>::value>(std::forward_as_tuple(args...));
}
CALLABLE mCallable;