diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
| commit | b1964a47005d7bbd99258af7f4eaf4b12baeb423 (patch) | |
| tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/llvfs/lldiriterator.cpp | |
| parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
| parent | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (diff) | |
Merged in DV528-merge-6.5.1 (pull request #774)
DRTVWR-528 merge up to 6.5.1
Diffstat (limited to 'indra/llvfs/lldiriterator.cpp')
| -rw-r--r-- | indra/llvfs/lldiriterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 3eb64e69d9..f57bf4ebc6 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -27,8 +27,8 @@ #include "lldiriterator.h" #include "fix_macros.h" +#include "llregex.h" #include <boost/filesystem.hpp> -#include <boost/regex.hpp> namespace fs = boost::filesystem; @@ -131,7 +131,7 @@ bool LLDirIterator::Impl::next(std::string &fname) { boost::smatch match; std::string name = mIter->path().filename().string(); - found = boost::regex_match(name, match, mFilterExp); + found = ll_regex_match(name, match, mFilterExp); if (found) { fname = name; |