[Bf-blender-cvs] [3d4e92eb962] master: Alembic: C++11 doesn't need the space between '> >'

[Sybren A. Stüvel]

Commit: 3d4e92eb9625c8cfd09cba650ff292b0eb634c0b
Author: Sybren A. Stüvel
Date:   Tue Jan 15 18:50:24 2019 +0100
Branches: master
https://developer.blender.org/rB3d4e92eb9625c8cfd09cba650ff292b0eb634c0b

Alembic: C++11 doesn't need the space between '> >'

C++11 doesn't need the space between '> >' in a nested templated
declaration, so instead of `std::vector<std::pair<a, b> >` we can now
write `std::vector<std::pair<a, b> >`.

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

M	source/blender/alembic/intern/abc_mesh.cc
M	source/blender/alembic/intern/abc_mesh.h
M	source/blender/alembic/intern/abc_nurbs.cc
M	source/blender/alembic/intern/abc_nurbs.h
M	source/blender/alembic/intern/abc_object.h

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

diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 2b6e1fd86ec..97908f7145b 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -516,10 +516,10 @@ void AbcGenericMeshWriter::writeSubD(struct Mesh *mesh)
 template <typename Schema>
 void AbcGenericMeshWriter::writeFaceSets(struct Mesh *me, Schema &schema)
 {
-	std::map< std::string, std::vector<int32_t> > geo_groups;
+	std::map< std::string, std::vector<int32_t>> geo_groups;
 	getGeoGroups(me, geo_groups);
 
-	std::map< std::string, std::vector<int32_t>  >::iterator it;
+	std::map< std::string, std::vector<int32_t>>::iterator it;
 	for (it = geo_groups.begin(); it != geo_groups.end(); ++it) {
 		OFaceSet face_set = schema.createFaceSet(it->first);
 		OFaceSetSchema::Sample samp;
@@ -620,7 +620,7 @@ void AbcGenericMeshWriter::getVelocities(struct Mesh *mesh, std::vector<Imath::V
 
 void AbcGenericMeshWriter::getGeoGroups(
         struct Mesh *mesh,
-        std::map<std::string, std::vector<int32_t> > &geo_groups)
+        std::map<std::string, std::vector<int32_t>> &geo_groups)
 {
 	const int num_poly = mesh->totpoly;
 	MPoly *polygons = mesh->mpoly;
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index b1842b14d17..a3fc7c0a4f7 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -70,7 +70,7 @@ protected:
 	void writeSubD(struct Mesh *mesh);
 
 	void writeArbGeoParams(struct Mesh *mesh);
-	void getGeoGroups(struct Mesh *mesh, std::map<std::string, std::vector<int32_t> > &geoGroups);
+	void getGeoGroups(struct Mesh *mesh, std::map<std::string, std::vector<int32_t>> &geoGroups);
 
 	/* fluid surfaces support */
 	void getVelocities(struct Mesh *mesh, std::vector<Imath::V3f> &vels);
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index fcb2f5c5ec5..02cc0cd8c75 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -209,7 +209,7 @@ bool AbcNurbsReader::valid() const
 		return false;
 	}
 
-	std::vector< std::pair<INuPatchSchema, IObject> >::const_iterator it;
+	std::vector<std::pair<INuPatchSchema, IObject>>::const_iterator it;
 	for (it = m_schemas.begin(); it != m_schemas.end(); ++it) {
 		const INuPatchSchema &schema = it->first;
 
@@ -243,7 +243,7 @@ void AbcNurbsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele
 	Curve *cu = static_cast<Curve *>(BKE_curve_add(bmain, "abc_curve", OB_SURF));
 	cu->actvert = CU_ACT_NONE;
 
-	std::vector< std::pair<INuPatchSchema, IObject> >::iterator it;
+	std::vector<std::pair<INuPatchSchema, IObject>>::iterator it;
 
 	for (it = m_schemas.begin(); it != m_schemas.end(); ++it) {
 		Nurb *nu = static_cast<Nurb *>(MEM_callocN(sizeof(Nurb), "abc_getnurb"));
diff --git a/source/blender/alembic/intern/abc_nurbs.h b/source/blender/alembic/intern/abc_nurbs.h
index 827aa4b365f..68e4d8ebf93 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -46,7 +46,7 @@ private:
 /* ************************************************************************** */
 
 class AbcNurbsReader : public AbcObjectReader {
-	std::vector< std::pair<Alembic::AbcGeom::INuPatchSchema, Alembic::Abc::IObject> > m_schemas;
+	std::vector<std::pair<Alembic::AbcGeom::INuPatchSchema, Alembic::Abc::IObject>> m_schemas;
 
 public:
 	AbcNurbsReader(const Alembic::Abc::IObject &object, ImportSettings &settings);
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index 8794cb61708..00dfda64b9b 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -49,7 +49,7 @@ protected:
 	Imath::Box3d m_bounds;
 	std::vector<AbcObjectWriter *> m_children;
 
-	std::vector< std::pair<std::string, IDProperty *> > m_props;
+	std::vector<std::pair<std::string, IDProperty *>> m_props;
 
 	bool m_first_frame;
 	std::string m_name;