diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp index b5f151c15..ba5db4625 100644 --- a/code/FBXBinaryTokenizer.cpp +++ b/code/FBXBinaryTokenizer.cpp @@ -55,14 +55,15 @@ namespace FBX { // ------------------------------------------------------------------------------------------------ Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int offset) - : sbegin(sbegin) + : + #ifdef DEBUG + contents(sbegin, static_cast(send-sbegin)), + #endif + sbegin(sbegin) , send(send) , type(type) , line(offset) , column(BINARY_MARKER) -#ifdef DEBUG - , contents(sbegin, static_cast(send-sbegin)) -#endif { ai_assert(sbegin); ai_assert(send); @@ -395,4 +396,4 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, unsigned int le } // !FBX } // !Assimp -#endif \ No newline at end of file +#endif diff --git a/code/FBXTokenizer.cpp b/code/FBXTokenizer.cpp index 7aa81543a..caa80c191 100644 --- a/code/FBXTokenizer.cpp +++ b/code/FBXTokenizer.cpp @@ -58,14 +58,15 @@ namespace FBX { // ------------------------------------------------------------------------------------------------ Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int line, unsigned int column) - : sbegin(sbegin) + : +#ifdef DEBUG + contents(sbegin, static_cast(send-sbegin)), +#endif + sbegin(sbegin) , send(send) , type(type) , line(line) , column(column) -#ifdef DEBUG - , contents(sbegin, static_cast(send-sbegin)) -#endif { ai_assert(sbegin); ai_assert(send);