Browse Source

Fix gcc warnings. (initialization order)

Denis Biryukov 11 years ago
parent
commit
ab6b5a7b21
2 changed files with 11 additions and 9 deletions
  1. 6 5
      code/FBXBinaryTokenizer.cpp
  2. 5 4
      code/FBXTokenizer.cpp

+ 6 - 5
code/FBXBinaryTokenizer.cpp

@@ -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);
@@ -395,4 +396,4 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, unsigned int le
 } // !FBX
 } // !FBX
 } // !Assimp
 } // !Assimp
 
 
-#endif
+#endif

+ 5 - 4
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)
 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);