diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-10 14:51:59 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-10 14:51:59 -0800 |
| commit | 573ab07a40acc78e28ae390331d862d3f858bb07 (patch) | |
| tree | 7944ca93182468372186d202e45ba1ddcd7635b2 /indra/llvfs/lldiriterator.cpp | |
| parent | 45e72bf3cbd08eef96663d569cec3ecae198a8e4 (diff) | |
| parent | fde976cf2bf9740dcd821ad37f0747beaabe34dd (diff) | |
Merge pull from lindenlab/viewer-beta
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; |