summaryrefslogtreecommitdiff
path: root/indra/llui/llcallbackmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llcallbackmap.h')
-rw-r--r--indra/llui/llcallbackmap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
index 07775dc30f..3115606d91 100644
--- a/indra/llui/llcallbackmap.h
+++ b/indra/llui/llcallbackmap.h
@@ -29,13 +29,13 @@
#include <map>
#include <string>
-#include <boost/function.hpp>
+#include <functional>
class LLCallbackMap
{
public:
// callback definition.
- typedef boost::function<void* (void* data)> callback_t;
+ typedef std::function<void* (void* data)> callback_t;
typedef std::map<std::string, LLCallbackMap> map_t;
typedef map_t::iterator map_iter_t;
@@ -48,8 +48,8 @@ public:
return (void*)panel;
}
- LLCallbackMap() : mCallback(NULL), mData(NULL) { }
- LLCallbackMap(callback_t callback, void* data = NULL) : mCallback(callback), mData(data) { }
+ LLCallbackMap() : mCallback(nullptr), mData(nullptr) {}
+ LLCallbackMap(callback_t callback, void* data = nullptr) : mCallback(callback), mData(data) {}
callback_t mCallback;
void* mData;