diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
| commit | 8756727a525f3c4f72d790adafb8d719dfc24a94 (patch) | |
| tree | ee201c54b5e218ed449bb90c398355c0c88ffa4e /indra/llcommon/tests | |
| parent | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (diff) | |
| parent | 4bda6873ee7baac1ac34f92178d871c430da88c6 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/llcommon/tests')
| -rw-r--r-- | indra/llcommon/tests/lleventcoro_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/tests/llinstancetracker_test.cpp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index a3c54ffaa2..ab174a8bde 100644 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -30,8 +30,6 @@ #include <boost/bind.hpp> #include <boost/range.hpp> #include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/make_shared.hpp> #include "linden_common.h" diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp index c6eb0fdf75..bf661dc051 100644 --- a/indra/llcommon/tests/llinstancetracker_test.cpp +++ b/indra/llcommon/tests/llinstancetracker_test.cpp @@ -37,8 +37,6 @@ #include <algorithm> // std::sort() #include <stdexcept> // std headers -// external library headers -#include <boost/scoped_ptr.hpp> // other Linden headers #include "../test/lltut.h" |