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

42
indra/llxml/llxmltree.cpp
View File

@@ -73,7 +73,7 @@ BOOL LLXmlTree::parseFile(const std::string &path, BOOL keep_contents)
{
S32 line_number = parser.getCurrentLineNumber();
const char* error = parser.getErrorString();
llwarns << "LLXmlTree parse failed. Line " << line_number << ": " << error << llendl;
LL_WARNS() << "LLXmlTree parse failed. Line " << line_number << ": " << error << LL_ENDL;
}
return success;
}
@@ -95,7 +95,7 @@ bool LLXmlTree::parseBuffer(const char *buf, int len)
if (!success) {
S32 line_number = mParser->getCurrentLineNumber();
const char* error = mParser->getErrorString();
llwarns << "LLXmlTree parse failed in line " << line_number << ": " << error << llendl;
LL_WARNS() << "LLXmlTree parse failed in line " << line_number << ": " << error << LL_ENDL;
delete mParser;
mParser = 0;
}
@@ -171,19 +171,19 @@ LLXmlTreeNode::~LLXmlTreeNode()
void LLXmlTreeNode::dump( const std::string& prefix )
{
llinfos << prefix << mName ;
LL_INFOS() << prefix << mName ;
if( !mContents.empty() )
{
llcont << " contents = \"" << mContents << "\"";
LL_CONT << " contents = \"" << mContents << "\"";
}
attribute_map_t::iterator iter;
for (iter=mAttributes.begin(); iter != mAttributes.end(); iter++)
{
LLStdStringHandle key = iter->first;
const std::string* value = iter->second;
llcont << prefix << " " << key << "=" << (value->empty() ? "NULL" : *value);
LL_CONT << prefix << " " << key << "=" << (value->empty() ? "NULL" : *value);
}
llcont << llendl;
LL_CONT << LL_ENDL;
}
void LLXmlTreeNode::writeNoChild(std::string &buffer, const std::string &indent) const
@@ -666,12 +666,12 @@ void LLXmlTreeParser::startElement(const char* name, const char **atts)
{
if( mDump )
{
llinfos << tabs() << "startElement " << name << llendl;
LL_INFOS() << tabs() << "startElement " << name << LL_ENDL;
S32 i = 0;
while( atts[i] && atts[i+1] )
{
llinfos << tabs() << "attribute: " << atts[i] << "=" << atts[i+1] << llendl;
LL_INFOS() << tabs() << "attribute: " << atts[i] << "=" << atts[i+1] << LL_ENDL;
i += 2;
}
}
@@ -708,7 +708,7 @@ void LLXmlTreeParser::endElement(const char* name)
{
if( mDump )
{
llinfos << tabs() << "endElement " << name << llendl;
LL_INFOS() << tabs() << "endElement " << name << LL_ENDL;
}
if( !mCurrent->mContents.empty() )
@@ -726,7 +726,7 @@ void LLXmlTreeParser::characterData(const char *s, int len)
if (s) str = std::string(s, len);
if( mDump )
{
llinfos << tabs() << "CharacterData " << str << llendl;
LL_INFOS() << tabs() << "CharacterData " << str << LL_ENDL;
}
if (mKeepContents)
@@ -739,7 +739,7 @@ void LLXmlTreeParser::processingInstruction(const char *target, const char *data
{
if( mDump )
{
llinfos << tabs() << "processingInstruction " << data << llendl;
LL_INFOS() << tabs() << "processingInstruction " << data << LL_ENDL;
}
}
@@ -747,7 +747,7 @@ void LLXmlTreeParser::comment(const char *data)
{
if( mDump )
{
llinfos << tabs() << "comment " << data << llendl;
LL_INFOS() << tabs() << "comment " << data << LL_ENDL;
}
}
@@ -755,7 +755,7 @@ void LLXmlTreeParser::startCdataSection()
{
if( mDump )
{
llinfos << tabs() << "startCdataSection" << llendl;
LL_INFOS() << tabs() << "startCdataSection" << LL_ENDL;
}
}
@@ -763,7 +763,7 @@ void LLXmlTreeParser::endCdataSection()
{
if( mDump )
{
llinfos << tabs() << "endCdataSection" << llendl;
LL_INFOS() << tabs() << "endCdataSection" << LL_ENDL;
}
}
@@ -773,7 +773,7 @@ void LLXmlTreeParser::defaultData(const char *s, int len)
{
std::string str;
if (s) str = std::string(s, len);
llinfos << tabs() << "defaultData " << str << llendl;
LL_INFOS() << tabs() << "defaultData " << str << LL_ENDL;
}
}
@@ -786,12 +786,12 @@ void LLXmlTreeParser::unparsedEntityDecl(
{
if( mDump )
{
llinfos << tabs() << "unparsed entity:" << llendl;
llinfos << tabs() << " entityName " << entity_name << llendl;
llinfos << tabs() << " base " << base << llendl;
llinfos << tabs() << " systemId " << system_id << llendl;
llinfos << tabs() << " publicId " << public_id << llendl;
llinfos << tabs() << " notationName " << notation_name<< llendl;
LL_INFOS() << tabs() << "unparsed entity:" << LL_ENDL;
LL_INFOS() << tabs() << " entityName " << entity_name << LL_ENDL;
LL_INFOS() << tabs() << " base " << base << LL_ENDL;
LL_INFOS() << tabs() << " systemId " << system_id << LL_ENDL;
LL_INFOS() << tabs() << " publicId " << public_id << LL_ENDL;
LL_INFOS() << tabs() << " notationName " << notation_name<< LL_ENDL;
}
}