fix merge

This commit is contained in:
Lee Thomason (grinliz)
2012-09-08 21:44:12 -07:00
2 changed files with 10 additions and 8 deletions

View File

@@ -136,16 +136,12 @@ char* StrPair::ParseName( char* p )
return 0;
}
if ( !XMLUtil::IsAlpha( *p ) ) {
return 0;
}
while( *p && (
XMLUtil::IsAlphaNum( (unsigned char) *p )
|| *p == '_'
|| *p == '-'
|| *p == '.'
|| *p == ':' ))
|| *p == ':'
|| (*p == '-' && p>start ) // can be in a name, but not lead it.
|| (*p == '.' && p>start ) )) // can be in a name, but not lead it.
{
++p;
}