diff --git a/src/ifcgeom/IfcGeomObjects.cpp b/src/ifcgeom/IfcGeomObjects.cpp index 672da0a660..66abc5b650 100644 --- a/src/ifcgeom/IfcGeomObjects.cpp +++ b/src/ifcgeom/IfcGeomObjects.cpp @@ -18,6 +18,7 @@ ********************************************************************************/ #include +#include #include #include diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/IfcGeomRenderStyles.cpp index 657af73e33..1691709300 100644 --- a/src/ifcgeom/IfcGeomRenderStyles.cpp +++ b/src/ifcgeom/IfcGeomRenderStyles.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include -#include +#include #include "IfcGeomRenderStyles.h" @@ -31,7 +31,7 @@ namespace IfcGeom { } } -bool process_colour(Ifc2x3::IfcColourRgb* colour, std::array& rgb) { +bool process_colour(Ifc2x3::IfcColourRgb* colour, std::tr1::array& rgb) { if (colour != 0) { rgb[0] = colour->Red(); rgb[1] = colour->Green(); @@ -40,7 +40,7 @@ bool process_colour(Ifc2x3::IfcColourRgb* colour, std::array& rgb) { return colour != 0; } -bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::array& rgb) { +bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::tr1::array& rgb) { if (factor != 0) { const double f = *factor->wrappedValue(); rgb[0] = rgb[1] = rgb[2] = f; @@ -48,7 +48,7 @@ bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::array& r return factor != 0; } -bool process_colour(Ifc2x3::IfcColourOrFactor colour_or_factor, std::array& rgb) { +bool process_colour(Ifc2x3::IfcColourOrFactor colour_or_factor, std::tr1::array& rgb) { if (colour_or_factor == 0) { return false; } else if (colour_or_factor->is(Ifc2x3::Type::IfcColourRgb)) { @@ -76,7 +76,7 @@ const IfcGeom::SurfaceStyle* IfcGeom::get_style(Ifc2x3::IfcRepresentationItem* i } else { surface_style = SurfaceStyle(surface_style_id); } - std::array rgb; + std::tr1::array rgb; if (process_colour(shading_styles.second->SurfaceColour(), rgb)) { surface_style.Diffuse().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2])); } diff --git a/src/ifcgeom/IfcGeomRenderStyles.h b/src/ifcgeom/IfcGeomRenderStyles.h index 77897ef220..ecdb4b217e 100644 --- a/src/ifcgeom/IfcGeomRenderStyles.h +++ b/src/ifcgeom/IfcGeomRenderStyles.h @@ -20,7 +20,7 @@ #ifndef IFCGEOMRENDERSTYLES_H #define IFCGEOMRENDERSTYLES_H -#include +#include #include "../ifcparse/Ifc2x3.h" @@ -29,7 +29,7 @@ namespace IfcGeom { public: class ColorComponent { private: - std::array data; + std::tr1::array data; public: ColorComponent(double r, double g, double b) { data[0] = r; data[1] = g; data[2] = b;