actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

g++ fix

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-07 02:05:19 +00:00
parent 2905beb755
commit 35dfba854e
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/XmlFile.cpp
+15 -15
View File
@@ -132,7 +132,7 @@ unsigned XNode::LoadAttributes( const CString &xml, PARSEINFO *pi, unsigned iOff
pi->error_code = PIE_ATTR_NO_VALUE; pi->error_code = PIE_ATTR_NO_VALUE;
pi->error_string = ssprintf( "<%s> attribute has error ", m_sName.c_str() ); pi->error_string = ssprintf( "<%s> attribute has error ", m_sName.c_str() );
} }
return string.npos; return string::npos;
} }
XAttr *attr = new XAttr; XAttr *attr = new XAttr;
@@ -202,8 +202,8 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
// < // <
iOffset = xml.find( chXMLTagOpen, iOffset ); iOffset = xml.find( chXMLTagOpen, iOffset );
if( iOffset == string.npos ) if( iOffset == string::npos )
return string.npos; return string::npos;
// </ // </
if( xml[iOffset+1] == chXMLTagPre ) if( xml[iOffset+1] == chXMLTagPre )
@@ -216,7 +216,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
/* Find the close tag. */ /* Find the close tag. */
unsigned iEnd = xml.find( "-->", iOffset ); unsigned iEnd = xml.find( "-->", iOffset );
if( iEnd == string.npos ) if( iEnd == string::npos )
{ {
if( !pi->error_occur ) if( !pi->error_occur )
{ {
@@ -226,7 +226,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
pi->error_string = "Unterminated comment"; pi->error_string = "Unterminated comment";
} }
return string.npos; return string::npos;
} }
// Skip -->. // Skip -->.
@@ -243,8 +243,8 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
// Generate XML Attributte List // Generate XML Attributte List
iOffset = LoadAttributes( xml, pi, iOffset ); iOffset = LoadAttributes( xml, pi, iOffset );
if( iOffset == string.npos ) if( iOffset == string::npos )
return string.npos; return string::npos;
// alone tag <TAG ... /> or <?TAG ... ?> or <!-- ... --> // alone tag <TAG ... /> or <?TAG ... ?> or <!-- ... -->
// current pointer: ^ ^ ^ // current pointer: ^ ^ ^
@@ -269,7 +269,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
} }
// ill-formed tag // ill-formed tag
return string.npos; return string::npos;
} }
// well-formed tag // well-formed tag
@@ -291,7 +291,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
// Text Value // Text Value
++iOffset; ++iOffset;
unsigned iEnd = xml.find( chXMLTagOpen, iOffset ); unsigned iEnd = xml.find( chXMLTagOpen, iOffset );
if( iEnd == string.npos ) if( iEnd == string::npos )
{ {
if( !pi->error_occur ) if( !pi->error_occur )
{ {
@@ -301,7 +301,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
pi->error_string = ssprintf( "%s must be closed with </%s>", m_sName.c_str(), m_sName.c_str() ); pi->error_string = ssprintf( "%s must be closed with </%s>", m_sName.c_str(), m_sName.c_str() );
} }
// error cos not exist CloseTag </TAG> // error cos not exist CloseTag </TAG>
return string.npos; return string::npos;
} }
bool trim = pi->trim_value; bool trim = pi->trim_value;
@@ -342,7 +342,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
continue; continue;
unsigned iEnd = xml.find_first_of( " >", iOffset ); unsigned iEnd = xml.find_first_of( " >", iOffset );
if( iEnd == string.npos ) if( iEnd == string::npos )
{ {
if( !pi->error_occur ) if( !pi->error_occur )
{ {
@@ -352,7 +352,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
pi->error_string = ssprintf( "it must be closed with </%s>", m_sName.c_str() ); pi->error_string = ssprintf( "it must be closed with </%s>", m_sName.c_str() );
} }
// error // error
return string.npos; return string::npos;
} }
CString closename; CString closename;
@@ -374,7 +374,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
pi->error_code = PIE_NOT_NESTED; pi->error_code = PIE_NOT_NESTED;
pi->error_string = ssprintf( "'<%s> ... </%s>' is not well-formed.", m_sName.c_str(), closename.c_str() ); pi->error_string = ssprintf( "'<%s> ... </%s>' is not well-formed.", m_sName.c_str(), closename.c_str() );
} }
return string.npos; return string::npos;
} }
} }
else // Alone child Tag Loaded else // Alone child Tag Loaded
@@ -383,7 +383,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
{ {
// Text Value // Text Value
unsigned iEnd = xml.find( chXMLTagOpen, iOffset ); unsigned iEnd = xml.find( chXMLTagOpen, iOffset );
if( iEnd == string.npos ) if( iEnd == string::npos )
{ {
// error cos not exist CloseTag </TAG> // error cos not exist CloseTag </TAG>
if( !pi->error_occur ) if( !pi->error_occur )
@@ -393,7 +393,7 @@ unsigned XNode::Load( const CString &xml, PARSEINFO *pi, unsigned iOffset )
pi->error_code = PIE_NOT_CLOSED; pi->error_code = PIE_NOT_CLOSED;
pi->error_string = ssprintf( "it must be closed with </%s>", m_sName.c_str() ); pi->error_string = ssprintf( "it must be closed with </%s>", m_sName.c_str() );
} }
return string.npos; return string::npos;
} }
bool trim = pi->trim_value; bool trim = pi->trim_value;