griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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> >`.
This commit is contained in:
Sybren A. Stüvel
2019-01-15 18:50:24 +01:00
parent 3ce9bcee70
commit 3d4e92eb96
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/alembic/intern/abc_mesh.cc
View File

@@ -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;

2
source/blender/alembic/intern/abc_mesh.h
View File

@@ -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);

4
source/blender/alembic/intern/abc_nurbs.cc
View File

@@ -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"));

2
source/blender/alembic/intern/abc_nurbs.h
View File

@@ -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);

2
source/blender/alembic/intern/abc_object.h
View File

@@ -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;