diff options
| author | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
| commit | cb82e865a02a32f2d4e207974ff9373a99ceec95 (patch) | |
| tree | ce19fff3e038e7097b09440f955d1018c97f571a /indra/llvfs/lldiriterator.cpp | |
| parent | b47a7751990b240198d4e868f5a35bbd1b34e4ee (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merging latest changes?
Diffstat (limited to 'indra/llvfs/lldiriterator.cpp')
| -rw-r--r-- | indra/llvfs/lldiriterator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index ff92cbb7fd..460d2a8b4f 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -26,6 +26,7 @@ #include "lldiriterator.h" +#include "fix_macros.h" #include <boost/filesystem.hpp> #include <boost/regex.hpp> @@ -59,7 +60,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { is_dir = fs::is_directory(dir_path); } - catch (fs::basic_filesystem_error<fs::path>& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -76,7 +77,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { mIter = fs::directory_iterator(dir_path); } - catch (fs::basic_filesystem_error<fs::path>& e) + catch (const fs::filesystem_error& e) { llwarns << e.what() << llendl; return; @@ -121,7 +122,7 @@ bool LLDirIterator::Impl::next(std::string &fname) while (mIter != end_itr && !found) { boost::smatch match; - std::string name = mIter->path().filename(); + std::string name = mIter->path().filename().string(); if (found = boost::regex_match(name, match, mFilterExp)) { fname = name; |