From 78f4d7d5925420d661c574f25ed15a4de65d7365 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Thu, 9 Jul 2015 13:23:40 +0000 Subject: [PATCH] Fix build with Boost 1.58.0. Patch by stinkfist0. Thanks. --- src/examples/IfcOpenHouse.cpp | 2 +- src/ifcgeom/IfcGeomFunctions.cpp | 2 +- src/ifcparse/IfcHierarchyHelper.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/examples/IfcOpenHouse.cpp b/src/examples/IfcOpenHouse.cpp index b2e3465772..5cfb523f63 100644 --- a/src/examples/IfcOpenHouse.cpp +++ b/src/examples/IfcOpenHouse.cpp @@ -45,7 +45,7 @@ typedef std::string S; typedef IfcParse::IfcGlobalId guid; typedef std::pair XY; -boost::none_t const null = (static_cast(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 --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp index 1a77cde6a9..c8e430283f 100644 --- a/src/ifcgeom/IfcGeomFunctions.cpp +++ b/src/ifcgeom/IfcGeomFunctions.cpp @@ -637,7 +637,7 @@ IfcSchema::IfcProductDefinitionShape* IfcGeom::tesselate(TopoDS_Shape& shape, do 0, std::string("Facetation"), std::string("SurfaceModel"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shapedef = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shapedef = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); es->push(shell); es->push(surface_model); diff --git a/src/ifcparse/IfcHierarchyHelper.cpp b/src/ifcparse/IfcHierarchyHelper.cpp index 3b0620c40e..d86fe6b7a4 100644 --- a/src/ifcparse/IfcHierarchyHelper.cpp +++ b/src/ifcparse/IfcHierarchyHelper.cpp @@ -278,7 +278,7 @@ IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addExtrudedPolyline(co ? context : getRepresentationContext("Model"), std::string("Body"), std::string("SweptSolid"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); addEntity(rep); addEntity(shape); addExtrudedPolyline(rep, points, h, place, place2, dir, context); @@ -292,7 +292,7 @@ void IfcHierarchyHelper::addBox(IfcSchema::IfcShapeRepresentation* rep, double w { if (false) { IfcSchema::IfcRectangleProfileDef* profile = new IfcSchema::IfcRectangleProfileDef( - IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, 0, place ? place : addPlacement2d(), w, d); + IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, boost::none, place ? place : addPlacement2d(), w, d); IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(profile, place2 ? place2 : addPlacement3d(), dir ? dir : addTriplet(0, 0, 1), h); @@ -333,7 +333,7 @@ IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addBox(double w, doubl IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation( context ? context : getRepresentationContext("Model"), std::string("Body"), std::string("SweptSolid"), items); reps->push(rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); addEntity(rep); addEntity(shape); addBox(rep, w, d, h, place, place2, dir, context); @@ -354,7 +354,7 @@ IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addAxisBox(double w, d reps->push(axis_rep); reps->push(body_rep); - IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps); + IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, reps); addEntity(shape); addEntity(body_rep); addBox(body_rep, w, d, h, 0, 0, 0, context);