Quellcode durchsuchen

Bugfix : Fix a compiler issue with OSX and Linux.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1250 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
kimmi vor 13 Jahren
Ursprung
Commit
8441ecf6bf
1 geänderte Dateien mit 7 neuen und 1 gelöschten Zeilen
  1. 7 1
      code/ObjTools.h

+ 7 - 1
code/ObjTools.h

@@ -222,6 +222,12 @@ inline char_t getFloat( char_t it, char_t end, float &value )
 	return it;
 }
 
+/**	@brief	Will perform a simple tokenize.
+ *	@param	str			String to tokenize.
+ *	@param	tokens		Array with tokens, will be empty if no token was found.
+ *	@param	delimiters	Delimiter for tokenize.
+ *	@return	Number of found token.
+ */
 template<class string_type>
 unsigned int tokenize( const string_type& str, std::vector<string_type>& tokens, 
 						 const string_type& delimiters )
@@ -230,7 +236,7 @@ unsigned int tokenize( const string_type& str, std::vector<string_type>& tokens,
 	string_type::size_type lastPos = str.find_first_not_of( delimiters, 0 );
 
 	// Find first "non-delimiter".
-	string_type::size_type pos = str.find_first_of( delimiters, lastPos );
+	size_t pos = str.find_first_of( delimiters, lastPos );
 	while ( string_type::npos != pos || string_type::npos != lastPos )
 	{
 		// Found a token, add it to the vector.