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/test | |
| parent | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (diff) | |
| parent | 4bda6873ee7baac1ac34f92178d871c430da88c6 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llevents_tut.cpp | 1 | ||||
| -rw-r--r-- | indra/test/test.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp index 875ca9ad89..bf5cd3f853 100644 --- a/indra/test/llevents_tut.cpp +++ b/indra/test/llevents_tut.cpp @@ -44,7 +44,6 @@ #include <typeinfo> // external library headers #include <boost/bind.hpp> -#include <boost/shared_ptr.hpp> #include <boost/assign/list_of.hpp> // other Linden headers #include "tests/listener.h" // must PRECEDE lltut.h diff --git a/indra/test/test.cpp b/indra/test/test.cpp index e0a43b2e08..6e280819df 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -56,10 +56,6 @@ #include <boost/iostreams/tee.hpp> #include <boost/iostreams/stream.hpp> -#include <boost/scoped_ptr.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/make_shared.hpp> -#include <boost/foreach.hpp> #include <fstream> |