AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

used stdlib strncmp function

This commit is contained in:
Lee Thomason 2015-10-09 14:42:12 -07:00
parent e4c0738318
commit 598a88d9fd
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tinyxml2.h
View File

@ -76,7 +76,7 @@ distribution.
#if defined(DEBUG) #if defined(DEBUG)
# if defined(_MSC_VER) # if defined(_MSC_VER)
# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like # // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like
# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } //if ( !(x)) WinDebugBreak() # define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); }
# elif defined (ANDROID_NDK) # elif defined (ANDROID_NDK)
# include <android/log.h> # include <android/log.h>
# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } # define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); }
@ -84,8 +84,10 @@ distribution.
# include <assert.h> # include <assert.h>
# define TIXMLASSERT assert # define TIXMLASSERT assert
# endif # endif
# define TIXML_STATIC_ASSERT(x) typedef char __STATIC_ASSERT__[( x )?1:-1]
#else #else
# define TIXMLASSERT( x ) {} # define TIXMLASSERT( x ) {}
# define TIXML_STATIC_ASSERT(x) {}
#endif #endif
@ -557,16 +559,7 @@ public:
if ( p == q ) { if ( p == q ) {
return true; return true;
} }
int n = 0; return strncmp( p, q, nChar ) == 0;
while( *p && *q && *p == *q && n<nChar ) {
++p;
++q;
++n;
}
if ( (n == nChar) || ( *p == 0 && *q == 0 ) ) {
return true;
}
return false;
} }
inline static bool IsUTF8Continuation( char p ) { inline static bool IsUTF8Continuation( char p ) {