summaryrefslogtreecommitdiff
path: root/indra/llui/llcallbackmap.h
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-07-30 10:07:14 -0700
committerRichard Nelson <none@none>2010-07-30 10:07:14 -0700
commit76a9c1214fd371bdccf11857156d318cd21ae8bd (patch)
tree829bd18ebb1ec90234973a980979ca92cebe38ff /indra/llui/llcallbackmap.h
parent5e32fb5d28921e8adcdade56b97861356c590855 (diff)
parent566e3969f98c7ac10fe151ba119a78ac5eda2e3c (diff)
merge
Diffstat (limited to 'indra/llui/llcallbackmap.h')
-rw-r--r--indra/llui/llcallbackmap.h3
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;