From 4ebba5bdd4079ee0d3e5a27a4d4521920d875e52 Mon Sep 17 00:00:00 2001
From: ulfjorensen <ulfjorensen@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Wed, 15 Feb 2012 23:44:52 +0000
Subject: [PATCH] Removed C++11 usage which I accidentally inserted

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1167 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 code/ColladaExporter.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index 1d8b04d42..005700145 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -136,7 +136,7 @@ void ColladaExporter::ReadMaterialSurface( Surface& poSurface, const aiMaterial*
   {
     aiString texfile;
     unsigned int uvChannel = 0;
-    pSrcMat->GetTexture( pTexture, 0, &texfile, nullptr, &uvChannel);
+    pSrcMat->GetTexture( pTexture, 0, &texfile, NULL, &uvChannel);
     poSurface.texture = texfile.C_Str();
     poSurface.channel = uvChannel;
   } else
@@ -198,7 +198,7 @@ void ColladaExporter::WriteMaterials()
     ReadMaterialSurface( materials[a].specular, mat, aiTextureType_SPECULAR, AI_MATKEY_COLOR_SPECULAR);
     ReadMaterialSurface( materials[a].emissive, mat, aiTextureType_EMISSIVE, AI_MATKEY_COLOR_EMISSIVE);
     ReadMaterialSurface( materials[a].reflective, mat, aiTextureType_REFLECTION, AI_MATKEY_COLOR_REFLECTIVE);
-    ReadMaterialSurface( materials[a].normal, mat, aiTextureType_NORMALS, nullptr, 0, 0);
+    ReadMaterialSurface( materials[a].normal, mat, aiTextureType_NORMALS, NULL, 0, 0);
 
     mat->Get( AI_MATKEY_SHININESS, materials[a].shininess);
   }
@@ -206,7 +206,7 @@ void ColladaExporter::WriteMaterials()
   // output textures if present
   mOutput << startstr << "<library_images>" << endstr; 
   PushTag();
-  for( auto it = materials.cbegin(); it != materials.cend(); ++it )
+  for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
   { 
     const Material& mat = *it;
     WriteImageEntry( mat.ambient, mat.name + "_ambient_image");
@@ -222,7 +222,7 @@ void ColladaExporter::WriteMaterials()
   // output effects - those are the actual carriers of information
   mOutput << startstr << "<library_effects>" << endstr;
   PushTag();
-  for( auto it = materials.cbegin(); it != materials.cend(); ++it )
+  for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
   {
     const Material& mat = *it;
     // this is so ridiculous it must be right
@@ -264,7 +264,7 @@ void ColladaExporter::WriteMaterials()
   // write materials - they're just effect references
   mOutput << startstr << "<library_materials>" << endstr;
   PushTag();
-  for( auto it = materials.cbegin(); it != materials.cend(); ++it )
+  for( std::vector<Material>::const_iterator it = materials.begin(); it != materials.end(); ++it )
   {
     const Material& mat = *it;
     mOutput << startstr << "<material id=\"" << mat.name << "\" name=\"" << mat.name << "\">" << endstr;