From 414b7614534e47b6d7b653cd0058ff0f0fd1cc24 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 16 Jan 2015 13:24:40 +0000 Subject: [PATCH] Don't rely on operator bool() but on bool operator!() for truthiness of boost::optionals. Fixes compilation with boost 1.56+. --- src/ifcgeom/IfcGeomObjects.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ifcgeom/IfcGeomObjects.cpp b/src/ifcgeom/IfcGeomObjects.cpp index 9e0b367652..eb13917f2f 100644 --- a/src/ifcgeom/IfcGeomObjects.cpp +++ b/src/ifcgeom/IfcGeomObjects.cpp @@ -812,10 +812,10 @@ IfcParse::IfcFile* IfcGeomObjects::GetFile() { static double black[3] = {0,0,0}; IfcGeomObjects::Material::Material(const IfcGeom::SurfaceStyle* style) : style(style) {} -bool IfcGeomObjects::Material::hasDiffuse() const { return style->Diffuse(); } -bool IfcGeomObjects::Material::hasSpecular() const { return style->Specular(); } -bool IfcGeomObjects::Material::hasTransparency() const { return style->Transparency(); } -bool IfcGeomObjects::Material::hasSpecularity() const { return style->Specularity(); } +bool IfcGeomObjects::Material::hasDiffuse() const { return style->Diffuse() ? true : false; } +bool IfcGeomObjects::Material::hasSpecular() const { return style->Specular() ? true : false; } +bool IfcGeomObjects::Material::hasTransparency() const { return style->Transparency() ? true : false; } +bool IfcGeomObjects::Material::hasSpecularity() const { return style->Specularity() ? true : false; } const double* IfcGeomObjects::Material::diffuse() const { if (hasDiffuse()) return &((*style->Diffuse()).R()); else return black; } const double* IfcGeomObjects::Material::specular() const { if (hasSpecular()) return &((*style->Specular()).R()); else return black; } double IfcGeomObjects::Material::transparency() const { if (hasTransparency()) return *style->Transparency(); else return 0; }