livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-543: Consistently use ClassicCallback<USERDATA> throughout.

master
Nat Goodspeed 2021-09-23 17:09:16 -04:00
parent 274fc85fcb
commit 1c3d2876ac
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/classic_callback.h
View File

@ -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;

8
indra/llcommon/tests/classic_callback_test.cpp
View File

@ -22,7 +22,7 @@
#include "../test/lltut.h"
/*****************************************************************************
* example callback accepting only (void* userdata)
* example callback
*****************************************************************************/
// callback_t is part of the specification of someAPI()
typedef void (*callback_t)(const char*, void*);
@ -47,12 +47,6 @@ struct MyCallback
std::string mMsg;
};
// a function for which I want to bind other data
void callback_with_extra(const std::string& extra, void*)
{
std::cout << "callback_with_extra('" << extra << "', *)\n";
}
/*****************************************************************************
* example callback accepting several params, and void* userdata isn't first
*****************************************************************************/