Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llvfs/lldiriterator.cpp
View File

@@ -64,13 +64,13 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
catch (fs::basic_filesystem_error<fs::path>& e)
#endif
{
llwarns << e.what() << llendl;
LL_WARNS() << e.what() << LL_ENDL;
return;
}
if (!is_dir)
{
llwarns << "Invalid path: \"" << dir_path.string() << "\"" << llendl;
LL_WARNS() << "Invalid path: \"" << dir_path.string() << "\"" << LL_ENDL;
return;
}
@@ -85,7 +85,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
catch (fs::basic_filesystem_error<fs::path>& e)
#endif
{
llerrs << e.what() << llendl;
LL_ERRS() << e.what() << LL_ENDL;
return;
}
@@ -101,8 +101,8 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
}
catch (boost::regex_error& e)
{
llerrs << "\"" << exp << "\" is not a valid regular expression: "
<< e.what() << llendl;
LL_ERRS() << "\"" << exp << "\" is not a valid regular expression: "
<< e.what() << LL_ENDL;
return;
}
@@ -119,7 +119,7 @@ bool LLDirIterator::Impl::next(std::string &fname)
if (!mIsValid)
{
llwarns << "The iterator is not correctly initialized." << llendl;
LL_WARNS() << "The iterator is not correctly initialized." << LL_ENDL;
return false;
}
@@ -186,7 +186,7 @@ std::string glob_to_regex(const std::string& glob)
case '}':
if (!braces)
{
llerrs << "glob_to_regex: Closing brace without an equivalent opening brace: " << glob << llendl;
LL_ERRS() << "glob_to_regex: Closing brace without an equivalent opening brace: " << glob << LL_ENDL;
}
regex+=')';
@@ -217,7 +217,7 @@ std::string glob_to_regex(const std::string& glob)
if (braces)
{
llerrs << "glob_to_regex: Unterminated brace expression: " << glob << llendl;
LL_ERRS() << "glob_to_regex: Unterminated brace expression: " << glob << LL_ENDL;
}
return regex;