diff options
| author | Rye <rye@alchemyviewer.org> | 2025-12-01 05:46:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-01 12:46:57 +0200 |
| commit | fb3f0e18a2ada57f98c3b10fab0c13fb2d504ae1 (patch) | |
| tree | f554227f66bc9d54ae78bb63a816e72d5575ae82 /indra/llrender | |
| parent | afb1f4d692bb593b3f200d490dd3f8fdeab8d279 (diff) | |
#5078 Replace boost::function with std::function
* Replace boost::function usage with std::function for easier debugging and reduced compiler warnings
* Remove a few remaining instances of boost::noncopyable that were missed in tests
Signed-off-by: Rye <rye@alchemyviewer.org>
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.h | 5 | ||||
| -rw-r--r-- | indra/llrender/lluiimage.h | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 24ba4d6deb..d19825d9ca 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -29,6 +29,7 @@ // This file contains various stuff for handling gl extensions and other gl related stuff. +#include <functional> #include <string> #include <boost/unordered_map.hpp> #include <list> @@ -230,8 +231,6 @@ void clear_glerror(); */ -#include "boost/function.hpp" - class LLGLState { public: @@ -279,7 +278,7 @@ public: class LLGLEnableFunc : LLGLState { public: - LLGLEnableFunc(LLGLenum state, bool enable, boost::function<void()> func) + LLGLEnableFunc(LLGLenum state, bool enable, std::function<void()> func) : LLGLState(state, enable) { if (enable) 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; |