Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove msvc specific leniencies

Browse Source
This commit is contained in:
Thomas Krijnen
2016-04-09 17:54:23 +02:00
parent 9d730054dd
commit 1142db3265
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeom.h
+1 -1
View File
@@ -96,7 +96,7 @@ public:
*this = other; *this = other;
} }
Kernel& Kernel::operator=(const Kernel& other) { Kernel& operator=(const Kernel& other) {
setValue(GV_DEFLECTION_TOLERANCE, other.getValue(GV_DEFLECTION_TOLERANCE)); setValue(GV_DEFLECTION_TOLERANCE, other.getValue(GV_DEFLECTION_TOLERANCE));
setValue(GV_WIRE_CREATION_TOLERANCE, other.getValue(GV_WIRE_CREATION_TOLERANCE)); setValue(GV_WIRE_CREATION_TOLERANCE, other.getValue(GV_WIRE_CREATION_TOLERANCE));
setValue(GV_MINIMAL_FACE_AREA, other.getValue(GV_MINIMAL_FACE_AREA)); setValue(GV_MINIMAL_FACE_AREA, other.getValue(GV_MINIMAL_FACE_AREA));
src/ifcgeom/IfcGeomFunctions.cpp
+4 -4
View File
@@ -1400,7 +1400,7 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre
} }
int connection_type_count[2] = {0,0}; 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; const int idx = it->first.first == IfcSchema::IfcConnectionTypeEnum::IfcConnectionType_ATSTART;
connection_type_count[idx] ++; connection_type_count[idx] ++;
} }
@@ -1414,8 +1414,8 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre
{ {
// Copy the unfolded surfaces // Copy the unfolded surfaces
result.resize(surfaces.size()); result.resize(surfaces.size());
auto result_it = result.begin() + 1; std::vector< std::vector<Handle_Geom_Surface> >::iterator result_it = result.begin() + 1;
auto input_it = surfaces.begin() + 1; std::vector<Handle_Geom_Surface>::const_iterator input_it = surfaces.begin() + 1;
for(; input_it != surfaces.end() - 1; ++result_it, ++input_it) { for(; input_it != surfaces.end() - 1; ++result_it, ++input_it) {
result_it->push_back(*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; : IfcSchema::IfcConnectionTypeEnum::IfcConnectionType_ATEND;
std::set<const IfcSchema::IfcProduct*> others; std::set<const IfcSchema::IfcProduct*> others;
endpoint_connections_t::const_iterator it = endpoint_connections.begin(); endpoint_connections_t::iterator it = endpoint_connections.begin();
while (it != endpoint_connections.end()) { while (it != endpoint_connections.end()) {
const IfcSchema::IfcProduct* other = it->second; const IfcSchema::IfcProduct* other = it->second;
if (others.find(other) != others.end()) { if (others.find(other) != others.end()) {
src/ifcgeom/IfcGeomRenderStyles.cpp
+4 -4
View File
@@ -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) { const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcMaterial* material) {
IfcSchema::IfcMaterialDefinitionRepresentation::list::ptr defs = material->HasRepresentation(); 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::IfcRepresentation::list::ptr reps = (*jt)->Representations();
IfcSchema::IfcStyledItem::list::ptr styles(new IfcSchema::IfcStyledItem::list); 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<IfcSchema::IfcStyledItem>()); styles->push((**it).Items()->as<IfcSchema::IfcStyledItem>());
} }
for (auto it = styles->begin(); it != styles->end(); ++it) { for (IfcSchema::IfcStyledItem::list::it it = styles->begin(); it != styles->end(); ++it) {
auto ss = get_surface_style<IfcSchema::IfcSurfaceStyleShading>(*it); const std::pair<IfcSchema::IfcSurfaceStyle*, IfcSchema::IfcSurfaceStyleShading*> ss = get_surface_style<IfcSchema::IfcSurfaceStyleShading>(*it);
if (ss.second) { if (ss.second) {
return internalize_surface_style(ss); return internalize_surface_style(ss);
} }