Merge pull request #762 from orbitcowboy/master

Improved const correctness. There are no functional changes intended.
This commit is contained in:
Lee Thomason
2020-03-01 16:42:35 -08:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -2101,7 +2101,7 @@ XMLDocument::~XMLDocument()
} }
void XMLDocument::MarkInUse(XMLNode* node) void XMLDocument::MarkInUse(const XMLNode* const node)
{ {
TIXMLASSERT(node); TIXMLASSERT(node);
TIXMLASSERT(node->_parent == 0); TIXMLASSERT(node->_parent == 0);

View File

@@ -562,7 +562,7 @@ public:
TIXMLASSERT( p ); TIXMLASSERT( p );
return p; return p;
} }
static char* SkipWhiteSpace( char* p, int* curLineNumPtr ) { static char* SkipWhiteSpace( char* const p, int* curLineNumPtr ) {
return const_cast<char*>( SkipWhiteSpace( const_cast<const char*>(p), curLineNumPtr ) ); return const_cast<char*>( SkipWhiteSpace( const_cast<const char*>(p), curLineNumPtr ) );
} }
@@ -600,7 +600,7 @@ public:
return strncmp( p, q, nChar ) == 0; return strncmp( p, q, nChar ) == 0;
} }
inline static bool IsUTF8Continuation( char p ) { inline static bool IsUTF8Continuation( const char p ) {
return ( p & 0x80 ) != 0; return ( p & 0x80 ) != 0;
} }
@@ -1894,7 +1894,7 @@ public:
char* Identify( char* p, XMLNode** node ); char* Identify( char* p, XMLNode** node );
// internal // internal
void MarkInUse(XMLNode*); void MarkInUse(const XMLNode* const);
virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const {
return 0; return 0;