diff options
author | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
commit | 50005b81f7788cd7a372ab3009568bdb9e024a6e (patch) | |
tree | 829bd18ebb1ec90234973a980979ca92cebe38ff /indra/llui/llcallbackmap.h | |
parent | 2051ba7248f11af083bbda9cd8b67be99d0d844b (diff) | |
parent | 9b526997d93d9290602a86f91a7f096da4395d97 (diff) |
merge
Diffstat (limited to 'indra/llui/llcallbackmap.h')
-rw-r--r-- | indra/llui/llcallbackmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h index 97b1e2fc50..60c4fc6b6d 100644 --- a/indra/llui/llcallbackmap.h +++ b/indra/llui/llcallbackmap.h @@ -35,12 +35,13 @@ #include <map> #include <string> +#include <boost/function.hpp> class LLCallbackMap { public: // callback definition. - typedef void* (*callback_t)(void* data); + typedef boost::function<void* (void* data)> callback_t; typedef std::map<std::string, LLCallbackMap> map_t; typedef map_t::iterator map_iter_t; |