Compilation fixes related to previous commit

This commit is contained in:
Thomas Krijnen
2014-12-19 12:36:06 +00:00
parent 2a403e240d
commit 3236218aba
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ namespace IfcGeom {
public:
const Representation::BRep& geometry() const { return *_geometry; }
ShapeModelElement(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf, Representation::BRep* geometry)
: Element(geometry->settings(),id,parent_id,name,type,guid,trsf)
: Element<P>(geometry->settings(),id,parent_id,name,type,guid,trsf)
, _geometry(geometry)
{}
virtual ~ShapeModelElement() {
+2 -1
View File
@@ -61,6 +61,7 @@
#include <map>
#include <set>
#include <vector>
#include <limits>
#include <algorithm>
#include <gp_Mat.hxx>
@@ -621,7 +622,7 @@ namespace IfcGeom {
// TODO: Correctly implement destructor for IfcFile
delete ifc_file;
std::vector<Element<P>*>::const_iterator it;
typename std::vector<Element<P>*>::const_iterator it;
for (it = returned_elements.begin(); it != returned_elements.end(); ++ it ) {
delete *it;
}
+1 -1
View File
@@ -243,7 +243,7 @@ namespace IfcGeom {
int i = (int) _verts.size() / 3;
if (settings().weld_vertices()) {
const VertexKey key = std::make_pair(material_index, std::make_pair(X, std::make_pair(Y, Z)));
VertexKeyMap::const_iterator it = welds.find(key);
typename VertexKeyMap::const_iterator it = welds.find(key);
if ( it != welds.end() ) return it->second;
i = (int) welds.size();
welds[key] = i;