Merge branch 'master' into v0.6.0

# Conflicts:
#	src/ifcgeom/IfcGeomIteratorImplementation.h
This commit is contained in:
Thomas Krijnen
2018-12-12 16:20:50 +01:00
9 changed files with 138 additions and 59 deletions
+1 -1
View File
@@ -724,8 +724,8 @@ namespace IfcGeom {
MAKE_TYPE_NAME(IteratorImplementation_)(const IteratorSettings& settings, IfcParse::IfcFile* file, const std::vector<IfcGeom::filter_t>& filters)
: settings(settings)
, ifc_file(file)
, owns_ifc_file(false)
, filters_(filters)
, owns_ifc_file(false)
{
_initialize();
}