Merge branch 'master' into v0.6.0

This commit is contained in:
Thomas Krijnen
2018-12-22 14:06:28 +01:00
3 changed files with 9 additions and 2 deletions
+3 -1
View File
@@ -444,9 +444,11 @@ IF(MSVC)
ENDFOREACH()
ENDIF()
ElSE()
add_definitions(-Wall -Wextra -Wno-maybe-uninitialized)
add_definitions(-Wall -Wextra)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_definitions(-Wno-tautological-constant-out-of-range-compare)
else()
add_definitions(-Wno-maybe-uninitialized)
endif()
# -fPIC is not relevant on Windows and creates pointless warnings
if (UNIX)
+3
View File
@@ -1968,8 +1968,11 @@ bool IfcGeom::Kernel::convert_layerset(const IfcSchema::IfcProduct* product, std
if (true) { /**< @todo Why always true? */
if (axis_curve->DynamicType() == STANDARD_TYPE(Geom_Line)) {
Handle_Geom_Line axis_line = Handle_Geom_Line::DownCast(axis_curve);
// @todo note that this creates an offset into the wrong order, the cross product arguments should be
// reversed. This causes some inversions later on, e.g. if(positive) { reverse(); }
reference_surface = new Geom_Plane(axis_line->Lin().Location(), axis_line->Lin().Direction() ^ gp::DZ());
} else if (axis_curve->DynamicType() == STANDARD_TYPE(Geom_Circle)) {
// @todo note that in this branch this inversion does not seem to take place.
Handle_Geom_Circle axis_line = Handle_Geom_Circle::DownCast(axis_curve);
reference_surface = new Geom_CylindricalSurface(axis_line->Position(), axis_line->Radius());
} else {
+3 -1
View File
@@ -68,7 +68,9 @@ public:
}
bool operator!=(const type_iterator& other) const {
return entities_by_type_t::const_iterator::operator!=(other);
const entities_by_type_t::const_iterator& self_ = *this;
const entities_by_type_t::const_iterator& other_ = other;
return self_ != other_;
}
};