From 1142db326510e39fc2f37e862e2bd5917a9df657 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 9 Apr 2016 17:54:23 +0200 Subject: [PATCH] remove msvc specific leniencies --- src/ifcgeom/IfcGeom.h | 2 +- src/ifcgeom/IfcGeomFunctions.cpp | 8 ++++---- src/ifcgeom/IfcGeomRenderStyles.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ifcgeom/IfcGeom.h b/src/ifcgeom/IfcGeom.h index 8150538ead..5e899e5461 100644 --- a/src/ifcgeom/IfcGeom.h +++ b/src/ifcgeom/IfcGeom.h @@ -96,7 +96,7 @@ public: *this = other; } - Kernel& Kernel::operator=(const Kernel& other) { + Kernel& operator=(const Kernel& other) { setValue(GV_DEFLECTION_TOLERANCE, other.getValue(GV_DEFLECTION_TOLERANCE)); setValue(GV_WIRE_CREATION_TOLERANCE, other.getValue(GV_WIRE_CREATION_TOLERANCE)); setValue(GV_MINIMAL_FACE_AREA, other.getValue(GV_MINIMAL_FACE_AREA)); diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp index 6e66b3b8f3..e76dc721e2 100644 --- a/src/ifcgeom/IfcGeomFunctions.cpp +++ b/src/ifcgeom/IfcGeomFunctions.cpp @@ -1400,7 +1400,7 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre } int connection_type_count[2] = {0,0}; - for (auto it = endpoint_connections.begin(); it != endpoint_connections.end(); ++it) { + for (endpoint_connections_t::const_iterator it = endpoint_connections.begin(); it != endpoint_connections.end(); ++it) { const int idx = it->first.first == IfcSchema::IfcConnectionTypeEnum::IfcConnectionType_ATSTART; connection_type_count[idx] ++; } @@ -1414,8 +1414,8 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre { // Copy the unfolded surfaces result.resize(surfaces.size()); - auto result_it = result.begin() + 1; - auto input_it = surfaces.begin() + 1; + std::vector< std::vector >::iterator result_it = result.begin() + 1; + std::vector::const_iterator input_it = surfaces.begin() + 1; for(; input_it != surfaces.end() - 1; ++result_it, ++input_it) { result_it->push_back(*input_it); } @@ -1434,7 +1434,7 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre : IfcSchema::IfcConnectionTypeEnum::IfcConnectionType_ATEND; std::set others; - endpoint_connections_t::const_iterator it = endpoint_connections.begin(); + endpoint_connections_t::iterator it = endpoint_connections.begin(); while (it != endpoint_connections.end()) { const IfcSchema::IfcProduct* other = it->second; if (others.find(other) != others.end()) { diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/IfcGeomRenderStyles.cpp index f70c9f48c7..7f03295e0d 100644 --- a/src/ifcgeom/IfcGeomRenderStyles.cpp +++ b/src/ifcgeom/IfcGeomRenderStyles.cpp @@ -112,14 +112,14 @@ const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcRepr const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcMaterial* material) { IfcSchema::IfcMaterialDefinitionRepresentation::list::ptr defs = material->HasRepresentation(); - for (auto jt = defs->begin(); jt != defs->end(); ++jt) { + for (IfcSchema::IfcMaterialDefinitionRepresentation::list::it jt = defs->begin(); jt != defs->end(); ++jt) { IfcSchema::IfcRepresentation::list::ptr reps = (*jt)->Representations(); IfcSchema::IfcStyledItem::list::ptr styles(new IfcSchema::IfcStyledItem::list); - for (auto it = reps->begin(); it != reps->end(); ++it) { + for (IfcSchema::IfcRepresentation::list::it it = reps->begin(); it != reps->end(); ++it) { styles->push((**it).Items()->as()); } - for (auto it = styles->begin(); it != styles->end(); ++it) { - auto ss = get_surface_style(*it); + for (IfcSchema::IfcStyledItem::list::it it = styles->begin(); it != styles->end(); ++it) { + const std::pair ss = get_surface_style(*it); if (ss.second) { return internalize_surface_style(ss); }