From fa71305e071e708e170e03636805d00885c47322 Mon Sep 17 00:00:00 2001 From: kimmi Date: Tue, 20 Mar 2012 21:03:14 +0000 Subject: [PATCH] =?UTF-8?q?Bugfix=20:=20Removed=20useless=20and=20weird=20?= =?UTF-8?q?const=5Fcast=20from=20TokenMatch.=20(=20merged=20from=20GitHub,?= =?UTF-8?q?=20thanks=20to=20Riku=20Palom=C3=A4ki=20).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1222 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ParsingUtils.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/ParsingUtils.h b/code/ParsingUtils.h index 39cfb29c5..5f2746455 100644 --- a/code/ParsingUtils.h +++ b/code/ParsingUtils.h @@ -167,7 +167,8 @@ AI_FORCE_INLINE bool IsNumeric( char_t in) return ( in >= '0' && in <= '9' ) || '-' == in || '+' == in; } // --------------------------------------------------------------------------------- -AI_FORCE_INLINE bool TokenMatch(char*& in, const char* token, unsigned int len) +template +AI_FORCE_INLINE bool TokenMatch(char_t*& in, const char* token, unsigned int len) { if (!::strncmp(token,in,len) && IsSpaceOrNewLine(in[len])) { @@ -192,11 +193,6 @@ AI_FORCE_INLINE bool TokenMatchI(const char*& in, const char* token, unsigned in return false; } // --------------------------------------------------------------------------------- -AI_FORCE_INLINE bool TokenMatch(const char*& in, const char* token, unsigned int len) -{ - return TokenMatch(const_cast(in), token, len); -} -// --------------------------------------------------------------------------------- AI_FORCE_INLINE void SkipToken(const char*& in) { SkipSpaces(&in);