# fix gcc compile errors

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@950 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/DeboneProcess.cpp

@@ -256,7 +256,7 @@ bool DeboneProcess::ConsiderMesh(const aiMesh* pMesh)
 
 // ------------------------------------------------------------------------------------------------
 // Splits the given mesh by bone count.
-void DeboneProcess::SplitMesh( const aiMesh* pMesh, std::vector<std::pair<aiMesh*,const aiBone*>>& poNewMeshes) const
+void DeboneProcess::SplitMesh( const aiMesh* pMesh, std::vector< std::pair< aiMesh*,const aiBone* > >& poNewMeshes) const
 {
 	// same deal here as ConsiderMesh basically
 
@@ -390,7 +390,7 @@ void DeboneProcess::UpdateNode(aiNode* pNode) const
 	for(unsigned int a=0;a<m;a++)	{
 
 		unsigned int srcIndex = pNode->mMeshes[a];
-		const std::vector<std::pair<unsigned int,aiNode*>> &subMeshes = mSubMeshIndices[srcIndex];
+		const std::vector< std::pair< unsigned int,aiNode* > > &subMeshes = mSubMeshIndices[srcIndex];
 		unsigned int nSubmeshes = subMeshes.size();
 
 		for(unsigned int b=0;b<nSubmeshes;b++) {
@@ -404,7 +404,7 @@ void DeboneProcess::UpdateNode(aiNode* pNode) const
 
 	for(unsigned int a=0;a<n;a++)
 	{
-		const std::vector<std::pair<unsigned int,aiNode*>> &subMeshes = mSubMeshIndices[a];
+		const std::vector< std::pair< unsigned int,aiNode* > > &subMeshes = mSubMeshIndices[a];
 		unsigned int nSubmeshes = subMeshes.size();
 
 		for(unsigned int b=0;b<nSubmeshes;b++) {

code/DeboneProcess.h

@@ -111,7 +111,7 @@ protected:
 	/// Splits the given mesh by bone count.
 	/// @param pMesh the Mesh to split. Is not changed at all, but might be superfluous in case it was split.
 	/// @param poNewMeshes Array of submeshes created in the process. Empty if splitting was not necessary.
-	void SplitMesh(const aiMesh* pMesh, std::vector<std::pair<aiMesh*,const aiBone*>>& poNewMeshes) const;
+	void SplitMesh(const aiMesh* pMesh, std::vector< std::pair< aiMesh*,const aiBone* > >& poNewMeshes) const;
 
 	/// Recursively updates the node's mesh list to account for the changed mesh list
 	void UpdateNode(aiNode* pNode) const;

tools/assimp_cmd/WriteDumb.cpp

@@ -906,7 +906,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd
 
 				fprintf(out,"\t\t\t<MatProperty key=\"%s\" \n\t\t\ttype=\"%s\" tex_usage=\"%s\" tex_index=\"%i\"",
 					prop->mKey.data, sz,
-					TextureTypeToString((aiTextureType)prop->mSemantic),prop->mIndex);
+					::TextureTypeToString((aiTextureType)prop->mSemantic),prop->mIndex);
 
 				if (prop->mType == aiPTI_Float) {
 					fprintf(out," size=\"%i\">\n\t\t\t\t",