Fix gcc warnings. (initialization order)

pull/387/head
Denis Biryukov 2014-09-15 23:35:03 +04:00
parent f2d26222fc
commit ab6b5a7b21
2 changed files with 11 additions and 9 deletions

View File

@ -55,14 +55,15 @@ namespace FBX {
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int offset) Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int offset)
: sbegin(sbegin) :
#ifdef DEBUG
contents(sbegin, static_cast<size_t>(send-sbegin)),
#endif
sbegin(sbegin)
, send(send) , send(send)
, type(type) , type(type)
, line(offset) , line(offset)
, column(BINARY_MARKER) , column(BINARY_MARKER)
#ifdef DEBUG
, contents(sbegin, static_cast<size_t>(send-sbegin))
#endif
{ {
ai_assert(sbegin); ai_assert(sbegin);
ai_assert(send); ai_assert(send);

View File

@ -58,14 +58,15 @@ namespace FBX {
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int line, unsigned int column) Token::Token(const char* sbegin, const char* send, TokenType type, unsigned int line, unsigned int column)
: sbegin(sbegin) :
#ifdef DEBUG
contents(sbegin, static_cast<size_t>(send-sbegin)),
#endif
sbegin(sbegin)
, send(send) , send(send)
, type(type) , type(type)
, line(line) , line(line)
, column(column) , column(column)
#ifdef DEBUG
, contents(sbegin, static_cast<size_t>(send-sbegin))
#endif
{ {
ai_assert(sbegin); ai_assert(sbegin);
ai_assert(send); ai_assert(send);