1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
diff -Naur IfcOpenShell-0.4.0-rc2.orig/src/examples/IfcOpenHouse.cpp IfcOpenShell-0.4.0-rc2/src/examples/IfcOpenHouse.cpp
--- IfcOpenShell-0.4.0-rc2.orig/src/examples/IfcOpenHouse.cpp 2015-10-24 15:25:46.346898794 +0200
+++ IfcOpenShell-0.4.0-rc2/src/examples/IfcOpenHouse.cpp 2015-10-24 15:46:14.363636904 +0200
@@ -40,7 +40,7 @@
typedef std::string S;
typedef IfcWrite::IfcGuidHelper guid;
typedef std::pair<double, double> XY;
-boost::none_t const null = (static_cast<boost::none_t>(0));
+boost::none_t const null = boost::none;
// The creation of Nurbs-surface for the IfcSite mesh, to be implemented lateron
void createGroundShape(TopoDS_Shape& shape);
diff -Naur IfcOpenShell-0.4.0-rc2.orig/src/ifcgeom/IfcGeomFunctions.cpp IfcOpenShell-0.4.0-rc2/src/ifcgeom/IfcGeomFunctions.cpp
--- IfcOpenShell-0.4.0-rc2.orig/src/ifcgeom/IfcGeomFunctions.cpp 2015-10-24 15:25:46.356898796 +0200
+++ IfcOpenShell-0.4.0-rc2/src/ifcgeom/IfcGeomFunctions.cpp 2015-10-24 15:47:41.246975292 +0200
@@ -568,7 +568,7 @@
0, std::string("Facetation"), std::string("SurfaceModel"), items);
reps->push(rep);
- Ifc2x3::IfcProductDefinitionShape* shapedef = new Ifc2x3::IfcProductDefinitionShape(0, 0, reps);
+ Ifc2x3::IfcProductDefinitionShape* shapedef = new Ifc2x3::IfcProductDefinitionShape(boost::none, boost::none, reps);
es->push(shell);
es->push(surface_model);
@@ -600,4 +600,4 @@
}
if (!removed) break;
}
-}
\ No newline at end of file
+}
diff -Naur IfcOpenShell-0.4.0-rc2.orig/src/ifcparse/IfcHierarchyHelper.cpp IfcOpenShell-0.4.0-rc2/src/ifcparse/IfcHierarchyHelper.cpp
--- IfcOpenShell-0.4.0-rc2.orig/src/ifcparse/IfcHierarchyHelper.cpp 2015-10-24 15:25:46.366898796 +0200
+++ IfcOpenShell-0.4.0-rc2/src/ifcparse/IfcHierarchyHelper.cpp 2015-10-24 15:49:42.396982340 +0200
@@ -267,7 +267,7 @@
? context
: getSingle<Ifc2x3::IfcRepresentationContext>(), std::string("Body"), std::string("SweptSolid"), items);
reps->push(rep);
- Ifc2x3::IfcProductDefinitionShape* shape = new Ifc2x3::IfcProductDefinitionShape(0, 0, reps);
+ Ifc2x3::IfcProductDefinitionShape* shape = new Ifc2x3::IfcProductDefinitionShape(boost::none, boost::none, reps);
AddEntity(rep);
AddEntity(shape);
addExtrudedPolyline(rep, points, h, place, place2, dir, context);
@@ -281,7 +281,7 @@
{
if (false) {
Ifc2x3::IfcRectangleProfileDef* profile = new Ifc2x3::IfcRectangleProfileDef(
- Ifc2x3::IfcProfileTypeEnum::IfcProfileType_AREA, 0, place ? place : addPlacement2d(), w, d);
+ Ifc2x3::IfcProfileTypeEnum::IfcProfileType_AREA, boost::none, place ? place : addPlacement2d(), w, d);
Ifc2x3::IfcExtrudedAreaSolid* solid = new Ifc2x3::IfcExtrudedAreaSolid(profile,
place2 ? place2 : addPlacement3d(), dir ? dir : addTriplet<Ifc2x3::IfcDirection>(0, 0, 1), h);
@@ -309,7 +309,7 @@
Ifc2x3::IfcShapeRepresentation* rep = new Ifc2x3::IfcShapeRepresentation(
context ? context : getSingle<Ifc2x3::IfcRepresentationContext>(), std::string("Body"), std::string("SweptSolid"), items);
reps->push(rep);
- Ifc2x3::IfcProductDefinitionShape* shape = new Ifc2x3::IfcProductDefinitionShape(0, 0, reps);
+ Ifc2x3::IfcProductDefinitionShape* shape = new Ifc2x3::IfcProductDefinitionShape(boost::none, boost::none, reps);
AddEntity(rep);
AddEntity(shape);
addBox(rep, w, d, h, place, place2, dir, context);
|