diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
| commit | f57219efed141b5bc33dd9d08b03a48c6607fa33 (patch) | |
| tree | 5744641957fe7ea94298228e4044d8c552a7dacb /indra/llcommon/tests/lltreeiterators_test.cpp | |
| parent | b49400e0882a80dd2972a31cde2152ba979b2ce4 (diff) | |
| parent | 6b866bc6432ef88a79a826c09b17107392bde15f (diff) | |
Merge branch 'release/2026.01' into marchcat/devlinux-2601
# Conflicts:
# indra/llcommon/llprocessor.cpp
# indra/llcorehttp/_refcounted.h
# indra/llcorehttp/_thread.h
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewershadermgr.cpp
Diffstat (limited to 'indra/llcommon/tests/lltreeiterators_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/lltreeiterators_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp index 7a2adfd8ba..6734596d25 100644 --- a/indra/llcommon/tests/lltreeiterators_test.cpp +++ b/indra/llcommon/tests/lltreeiterators_test.cpp @@ -32,6 +32,7 @@ // STL headers // std headers +#include <functional> #include <iostream> #include <sstream> #include <string> @@ -915,7 +916,7 @@ struct WalkExpected<LLTreeIter::BFS>: public Expected template <class NODE, typename CHILDITER> typename LLPtrTo<NODE>::type get_B2b(const typename LLPtrTo<NODE>::type& root, - const boost::function<CHILDITER(const typename LLPtrTo<NODE>::type&)>& child_begin) + const std::function<CHILDITER(const typename LLPtrTo<NODE>::type&)>& child_begin) { typedef typename LLPtrTo<NODE>::type NodePtr; CHILDITER Bi(child_begin(root)); |