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/newview/tests/lldateutil_test.cpp | |
| parent | d0db6a49eb7c7dddcde2a340c8ad6c1f1af6e2cf (diff) | |
| parent | 8896239134a40f41d845c78551d24e005d691d7c (diff) | |
Merge develop into develop-linux
Merge pull request #5316 from RyeMutt/rye/devlinuxupdate
Diffstat (limited to 'indra/newview/tests/lldateutil_test.cpp')
| -rw-r--r-- | indra/newview/tests/lldateutil_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp index acbf019034..3e2e5e70a2 100644 --- a/indra/newview/tests/lldateutil_test.cpp +++ b/indra/newview/tests/lldateutil_test.cpp @@ -34,16 +34,16 @@ #include "lltrans.h" #include "llui.h" -#include <map> +#include <unordered_map> // Baked-in return values for getString() -std::map< std::string, std::string, std::less<>> gString; +std::unordered_map< std::string, std::string, ll::string_hash, std::equal_to<>> gString; // Baked-in return values for getCountString() // map of pairs of input xml_desc and integer count typedef std::pair< std::string, int > count_string_t; -std::map< count_string_t, std::string > gCountString; +std::map<count_string_t, std::string> gCountString; std::string LLTrans::getString(const std::string_view xml_desc, const LLStringUtil::format_map_t& args, bool def_string) { |