summaryrefslogtreecommitdiff
path: root/indra/llrender/lluiimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llrender/lluiimage.h')
-rw-r--r--indra/llrender/lluiimage.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llrender/lluiimage.h b/indra/llrender/lluiimage.h
index 7988243a89..7dde84f295 100644
--- a/indra/llrender/lluiimage.h
+++ b/indra/llrender/lluiimage.h
@@ -30,14 +30,15 @@
#include "v4color.h"
#include "llpointer.h"
#include "llrefcount.h"
-#include "llrefcount.h"
#include "llrect.h"
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
#include "llinitparam.h"
#include "lltexture.h"
#include "llrender2dutils.h"
+#include <boost/signals2.hpp>
+
+#include <type_traits>
+
extern const LLColor4 UI_VERTEX_COLOR;
class LLUIImage : public LLRefCount
@@ -119,7 +120,7 @@ namespace LLInitParam
class ParamValue<LLUIImage*>
: public CustomParamValue<LLUIImage*>
{
- typedef boost::add_reference<boost::add_const<LLUIImage*>::type>::type T_const_ref;
+ typedef std::add_lvalue_reference<std::add_const<LLUIImage*>::type>::type T_const_ref;
typedef CustomParamValue<LLUIImage*> super_t;
public:
Optional<std::string> name;