diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-22 13:28:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-22 13:28:19 +0200 |
| commit | 5533f58d41443971d667de52c1e73bf24e429247 (patch) | |
| tree | b5f823454cf491c4a83ecc8cf987cf465854ca30 /indra/llcommon/llstaticstringtable.h | |
| parent | d0db6a49eb7c7dddcde2a340c8ad6c1f1af6e2cf (diff) | |
| parent | 8896239134a40f41d845c78551d24e005d691d7c (diff) | |
Merge develop into develop-linux
Merge pull request #5316 from RyeMutt/rye/devlinuxupdate
Diffstat (limited to 'indra/llcommon/llstaticstringtable.h')
| -rw-r--r-- | indra/llcommon/llstaticstringtable.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llstaticstringtable.h b/indra/llcommon/llstaticstringtable.h index 66ba3487c4..edff955ee7 100644 --- a/indra/llcommon/llstaticstringtable.h +++ b/indra/llcommon/llstaticstringtable.h @@ -29,9 +29,10 @@ #define LL_STATIC_STRING_TABLE_H #include "lldefs.h" -#include <boost/unordered_map.hpp> #include "llstl.h" +#include <unordered_map> + class LLStaticHashedString { public: @@ -74,7 +75,7 @@ struct LLStaticStringHasher template< typename MappedObject > class LL_COMMON_API LLStaticStringTable - : public boost::unordered_map< LLStaticHashedString, MappedObject, LLStaticStringHasher > + : public std::unordered_map< LLStaticHashedString, MappedObject, LLStaticStringHasher > { }; |