diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
| commit | 3021e1959ec32192e03e8e210db4b174250c87e2 (patch) | |
| tree | 19eb7557666b6871cef246bb23085665465021f8 /indra/llcommon/tests/lltreeiterators_test.cpp | |
| parent | 29518cdf4a9e3c9ee214d358bcc1e8f1c3fd6c93 (diff) | |
| parent | 189ffd46e0316e333bc850f69eb7ed57dd7829e7 (diff) | |
Merge branch 'develop-linux' into marchcat/slua-linux
# Conflicts:
# indra/newview/llfeaturemanager.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)); |