[Bf-blender-cvs] [7dc4c20e90] temp-sybren-alembic: FIXUP no longer using typedef for m_shapes_type

[Sybren A. Stüvel]

Commit: 7dc4c20e903d1f0a532573ede32b5f7188e0932b
Author: Sybren A. Stüvel
Date:   Wed Mar 1 14:26:56 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rB7dc4c20e903d1f0a532573ede32b5f7188e0932b

FIXUP no longer using typedef for m_shapes_type

===================================================================

M	source/blender/alembic/intern/abc_exporter.cc
M	source/blender/alembic/intern/abc_exporter.h

===================================================================

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 89d77d94d6..d6e681bc88 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -160,9 +160,8 @@ AbcExporter::~AbcExporter()
 	}
 
 	/* Free shapes vector */
-	m_shapes_type::iterator it_s, e_s;
-	for (it_s = m_shapes.begin(), e_s = m_shapes.end(); it_s != e_s; ++it_s) {
-		delete *it_s;
+	for (int i = 0, e = m_shapes.size(); i != e; ++i) {
+		delete m_shapes[i];
 	}
 
 	delete m_writer;
@@ -316,9 +315,8 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled)
 		setCurrentFrame(bmain, frame - m_settings.frame_start);
 
 		if (shape_frames.count(frame) != 0) {
-			m_shapes_type::iterator xit, xe;
-			for (xit = m_shapes.begin(), xe = m_shapes.end(); xit != xe; ++xit) {
-				(*xit)->write();
+			for (int i = 0, e = m_shapes.size(); i != e; ++i) {
+				m_shapes[i]->write();
 			}
 		}
 
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 0249bbf853..b902b45fa0 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -90,8 +90,7 @@ class AbcExporter {
 	typedef std::map<std::string, AbcTransformWriter *> m_xforms_type;
 	m_xforms_type m_xforms;
 
-	typedef std::vector<AbcObjectWriter *> m_shapes_type;
-	m_shapes_type m_shapes;
+	std::vector<AbcObjectWriter *> m_shapes;
 
 public:
 	AbcExporter(Scene *scene, const char *filename, ExportSettings &settings);