|
From: <sl...@us...> - 2003-11-23 18:19:13
|
Update of /cvsroot/aedgui/aedGUI/src/tinyxml
In directory sc8-pr-cvs1:/tmp/cvs-serv20873/src/tinyxml
Modified Files:
tinyxml.cpp tinyxmlparser.cpp
Log Message:
const const is illegal syntax for gcc
Index: tinyxml.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/tinyxml/tinyxml.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tinyxml.cpp 6 Nov 2003 18:46:40 -0000 1.3
--- tinyxml.cpp 23 Nov 2003 18:19:10 -0000 1.4
***************
*** 315,319 ****
TiXmlNode *
! TiXmlNode::FirstChild(const char *value) const const
{
TiXmlNode *node;
--- 315,319 ----
TiXmlNode *
! TiXmlNode::FirstChild(const char *value) const
{
TiXmlNode *node;
***************
*** 328,332 ****
TiXmlNode *
! TiXmlNode::LastChild(const char *value) const const
{
TiXmlNode *node;
--- 328,332 ----
TiXmlNode *
! TiXmlNode::LastChild(const char *value) const
{
TiXmlNode *node;
***************
*** 341,345 ****
TiXmlNode *
! TiXmlNode::IterateChildren(TiXmlNode * previous) const const
{
if(!previous)
--- 341,345 ----
TiXmlNode *
! TiXmlNode::IterateChildren(TiXmlNode * previous) const
{
if(!previous)
***************
*** 355,359 ****
TiXmlNode *
! TiXmlNode::IterateChildren(const char *val, TiXmlNode * previous) const const
{
if(!previous)
--- 355,359 ----
TiXmlNode *
! TiXmlNode::IterateChildren(const char *val, TiXmlNode * previous) const
{
if(!previous)
***************
*** 369,373 ****
TiXmlNode *
! TiXmlNode::NextSibling(const char *value) const const
{
TiXmlNode *node;
--- 369,373 ----
TiXmlNode *
! TiXmlNode::NextSibling(const char *value) const
{
TiXmlNode *node;
***************
*** 383,387 ****
TiXmlNode *
! TiXmlNode::PreviousSibling(const char *value) const const
{
TiXmlNode *node;
--- 383,387 ----
TiXmlNode *
! TiXmlNode::PreviousSibling(const char *value) const
{
TiXmlNode *node;
***************
*** 408,412 ****
TiXmlElement *
! TiXmlNode::FirstChildElement() const const
{
TiXmlNode *node;
--- 408,412 ----
TiXmlElement *
! TiXmlNode::FirstChildElement() const
{
TiXmlNode *node;
***************
*** 421,425 ****
TiXmlElement *
! TiXmlNode::FirstChildElement(const char *value) const const
{
TiXmlNode *node;
--- 421,425 ----
TiXmlElement *
! TiXmlNode::FirstChildElement(const char *value) const
{
TiXmlNode *node;
***************
*** 435,439 ****
TiXmlElement *
! TiXmlNode::NextSiblingElement() const const
{
TiXmlNode *node;
--- 435,439 ----
TiXmlElement *
! TiXmlNode::NextSiblingElement() const
{
TiXmlNode *node;
***************
*** 448,452 ****
TiXmlElement *
! TiXmlNode::NextSiblingElement(const char *value) const const
{
TiXmlNode *node;
--- 448,452 ----
TiXmlElement *
! TiXmlNode::NextSiblingElement(const char *value) const
{
TiXmlNode *node;
***************
*** 463,467 ****
TiXmlDocument *
! TiXmlNode::GetDocument() const const
{
const TiXmlNode *node;
--- 463,467 ----
TiXmlDocument *
! TiXmlNode::GetDocument() const
{
const TiXmlNode *node;
***************
*** 494,498 ****
const char *
! TiXmlElement::Attribute(const char *name) const const
{
TiXmlAttribute *node = attributeSet.Find(name);
--- 494,498 ----
const char *
! TiXmlElement::Attribute(const char *name) const
{
TiXmlAttribute *node = attributeSet.Find(name);
***************
*** 506,510 ****
const char *
! TiXmlElement::Attribute(const char *name, int *i) const const
{
const char *s = Attribute(name);
--- 506,510 ----
const char *
! TiXmlElement::Attribute(const char *name, int *i) const
{
const char *s = Attribute(name);
***************
*** 558,562 ****
void
! TiXmlElement::Print(FILE * cfile, int depth) const const
{
int i;
--- 558,562 ----
void
! TiXmlElement::Print(FILE * cfile, int depth) const
{
int i;
***************
*** 613,617 ****
void
! TiXmlElement::StreamOut(TIXML_OSTREAM * stream) const const
{
(*stream) << "<" << value;
--- 613,617 ----
void
! TiXmlElement::StreamOut(TIXML_OSTREAM * stream) const
{
(*stream) << "<" << value;
***************
*** 646,650 ****
TiXmlNode *
! TiXmlElement::Clone() const const
{
TiXmlElement *clone = new TiXmlElement(Value());
--- 646,650 ----
TiXmlNode *
! TiXmlElement::Clone() const
{
TiXmlElement *clone = new TiXmlElement(Value());
***************
*** 702,706 ****
bool
! TiXmlDocument::SaveFile() const const
{
// See STL_STRING_BUG below.
--- 702,706 ----
bool
! TiXmlDocument::SaveFile() const
{
// See STL_STRING_BUG below.
***************
*** 773,777 ****
bool
! TiXmlDocument::SaveFile(const char *filename) const const
{
// The old c stuff lives on...
--- 773,777 ----
bool
! TiXmlDocument::SaveFile(const char *filename) const
{
// The old c stuff lives on...
***************
*** 789,793 ****
TiXmlNode *
! TiXmlDocument::Clone() const const
{
TiXmlDocument *clone = new TiXmlDocument();
--- 789,793 ----
TiXmlNode *
! TiXmlDocument::Clone() const
{
TiXmlDocument *clone = new TiXmlDocument();
***************
*** 811,815 ****
void
! TiXmlDocument::Print(FILE * cfile, int depth) const const
{
TiXmlNode *node;
--- 811,815 ----
void
! TiXmlDocument::Print(FILE * cfile, int depth) const
{
TiXmlNode *node;
***************
*** 823,827 ****
void
! TiXmlDocument::StreamOut(TIXML_OSTREAM * out) const const
{
TiXmlNode *node;
--- 823,827 ----
void
! TiXmlDocument::StreamOut(TIXML_OSTREAM * out) const
{
TiXmlNode *node;
***************
*** 840,844 ****
TiXmlAttribute *
! TiXmlAttribute::Next() const const
{
// We are using knowledge of the sentinel. The sentinel
--- 840,844 ----
TiXmlAttribute *
! TiXmlAttribute::Next() const
{
// We are using knowledge of the sentinel. The sentinel
***************
*** 851,855 ****
TiXmlAttribute *
! TiXmlAttribute::Previous() const const
{
// We are using knowledge of the sentinel. The sentinel
--- 851,855 ----
TiXmlAttribute *
! TiXmlAttribute::Previous() const
{
// We are using knowledge of the sentinel. The sentinel
***************
*** 862,866 ****
void
! TiXmlAttribute::Print(FILE * cfile, int /*depth */ ) const const
{
TIXML_STRING n, v;
--- 862,866 ----
void
! TiXmlAttribute::Print(FILE * cfile, int /*depth */ ) const
{
TIXML_STRING n, v;
***************
*** 877,881 ****
void
! TiXmlAttribute::StreamOut(TIXML_OSTREAM * stream) const const
{
if(value.find('\"') != TIXML_STRING::npos)
--- 877,881 ----
void
! TiXmlAttribute::StreamOut(TIXML_OSTREAM * stream) const
{
if(value.find('\"') != TIXML_STRING::npos)
***************
*** 914,918 ****
const int
! TiXmlAttribute::IntValue() const const
{
return atoi(value.c_str());
--- 914,918 ----
const int
! TiXmlAttribute::IntValue() const
{
return atoi(value.c_str());
***************
*** 920,924 ****
const double
! TiXmlAttribute::DoubleValue() const const
{
return atof(value.c_str());
--- 920,924 ----
const double
! TiXmlAttribute::DoubleValue() const
{
return atof(value.c_str());
***************
*** 926,930 ****
void
! TiXmlComment::Print(FILE * cfile, int depth) const const
{
for(int i = 0; i < depth; i++)
--- 926,930 ----
void
! TiXmlComment::Print(FILE * cfile, int depth) const
{
for(int i = 0; i < depth; i++)
***************
*** 936,940 ****
void
! TiXmlComment::StreamOut(TIXML_OSTREAM * stream) const const
{
(*stream) << "<!--";
--- 936,940 ----
void
! TiXmlComment::StreamOut(TIXML_OSTREAM * stream) const
{
(*stream) << "<!--";
***************
*** 944,948 ****
TiXmlNode *
! TiXmlComment::Clone() const const
{
TiXmlComment *clone = new TiXmlComment();
--- 944,948 ----
TiXmlNode *
! TiXmlComment::Clone() const
{
TiXmlComment *clone = new TiXmlComment();
***************
*** 957,961 ****
void
! TiXmlText::Print(FILE * cfile, int /*depth */ ) const const
{
TIXML_STRING buffer;
--- 957,961 ----
void
! TiXmlText::Print(FILE * cfile, int /*depth */ ) const
{
TIXML_STRING buffer;
***************
*** 967,971 ****
void
! TiXmlText::StreamOut(TIXML_OSTREAM * stream) const const
{
PutString(value, stream);
--- 967,971 ----
void
! TiXmlText::StreamOut(TIXML_OSTREAM * stream) const
{
PutString(value, stream);
***************
*** 974,978 ****
TiXmlNode *
! TiXmlText::Clone() const const
{
TiXmlText *clone = 0;
--- 974,978 ----
TiXmlNode *
! TiXmlText::Clone() const
{
TiXmlText *clone = 0;
***************
*** 998,1002 ****
void
! TiXmlDeclaration::Print(FILE * cfile, int /*depth */ ) const const
{
fprintf(cfile, "<?xml ");
--- 998,1002 ----
void
! TiXmlDeclaration::Print(FILE * cfile, int /*depth */ ) const
{
fprintf(cfile, "<?xml ");
***************
*** 1012,1016 ****
void
! TiXmlDeclaration::StreamOut(TIXML_OSTREAM * stream) const const
{
(*stream) << "<?xml ";
--- 1012,1016 ----
void
! TiXmlDeclaration::StreamOut(TIXML_OSTREAM * stream) const
{
(*stream) << "<?xml ";
***************
*** 1038,1042 ****
TiXmlNode *
! TiXmlDeclaration::Clone() const const
{
TiXmlDeclaration *clone = new TiXmlDeclaration();
--- 1038,1042 ----
TiXmlNode *
! TiXmlDeclaration::Clone() const
{
TiXmlDeclaration *clone = new TiXmlDeclaration();
***************
*** 1054,1058 ****
void
! TiXmlUnknown::Print(FILE * cfile, int depth) const const
{
for(int i = 0; i < depth; i++)
--- 1054,1058 ----
void
! TiXmlUnknown::Print(FILE * cfile, int depth) const
{
for(int i = 0; i < depth; i++)
***************
*** 1062,1066 ****
void
! TiXmlUnknown::StreamOut(TIXML_OSTREAM * stream) const const
{
(*stream) << "<" << value << ">"; // Don't use entities hear! It is unknown.
--- 1062,1066 ----
void
! TiXmlUnknown::StreamOut(TIXML_OSTREAM * stream) const
{
(*stream) << "<" << value << ">"; // Don't use entities hear! It is unknown.
***************
*** 1068,1072 ****
TiXmlNode *
! TiXmlUnknown::Clone() const const
{
TiXmlUnknown *clone = new TiXmlUnknown();
--- 1068,1072 ----
TiXmlNode *
! TiXmlUnknown::Clone() const
{
TiXmlUnknown *clone = new TiXmlUnknown();
***************
*** 1126,1130 ****
TiXmlAttribute *
! TiXmlAttributeSet::Find(const char *name) const const
{
TiXmlAttribute *node;
--- 1126,1130 ----
TiXmlAttribute *
! TiXmlAttributeSet::Find(const char *name) const
{
TiXmlAttribute *node;
Index: tinyxmlparser.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/tinyxml/tinyxmlparser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinyxmlparser.cpp 6 Nov 2003 18:46:40 -0000 1.2
--- tinyxmlparser.cpp 23 Nov 2003 18:19:10 -0000 1.3
***************
*** 997,1001 ****
bool
! TiXmlText::Blank() const const
{
for(unsigned i = 0; i < value.length(); i++)
--- 997,1001 ----
bool
! TiXmlText::Blank() const
{
for(unsigned i = 0; i < value.length(); i++)
|