Patch by Antti Risteli (andepoikka)

Compile problems on gcc ubuntu-4.4.3 + misc
This commit is contained in:
Thomas Krijnen
2011-07-22 08:24:00 +00:00
parent 8767f6e52a
commit 75c26a34e1
4 changed files with 13 additions and 11 deletions
+2 -1
View File
@@ -587,7 +587,8 @@ EntityPtr Ifc::EntityById(int id) {
return it->second; return it->second;
} }
IfcException::IfcException(std::string e) { error = e; } IfcException::IfcException(std::string e) { error = e; }
const char* IfcException::what() const { return error.c_str(); } IfcException::~IfcException() throw () {}
const char* IfcException::what() const throw() { return error.c_str(); }
void Ifc::Dispose() { void Ifc::Dispose() {
file->Close(); file->Close();
delete file; delete file;
+1
View File
@@ -256,6 +256,7 @@ namespace IfcParse {
std::string error; std::string error;
public: public:
IfcException(std::string e); IfcException(std::string e);
~IfcException () throw ();
const char* what() const throw(); const char* what() const throw();
}; };
} }
+9 -9
View File
@@ -332,23 +332,23 @@ IFC_END_CLASS
IFC_RENDER_CLASS(Plate) IFC_RENDER_CLASS(Plate)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowFitting) IFC_RENDER_CLASS(FlowFitting)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowSegment) IFC_RENDER_CLASS(FlowSegment)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowController) IFC_RENDER_CLASS(FlowController)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowTerminal) IFC_RENDER_CLASS(FlowTerminal)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowMovingDevice) IFC_RENDER_CLASS(FlowMovingDevice)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcEnergyConversionDevice) IFC_RENDER_CLASS(EnergyConversionDevice)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowStorageDevice) IFC_RENDER_CLASS(FlowStorageDevice)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcFlowTreatmentDevice) IFC_RENDER_CLASS(FlowTreatmentDevice)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(IfcDistributionChamberElement) IFC_RENDER_CLASS(DistributionChamberElement)
IFC_END_CLASS IFC_END_CLASS
IFC_RENDER_CLASS(DistributionControlElement) IFC_RENDER_CLASS(DistributionControlElement)
IFC_END_CLASS IFC_END_CLASS
+1 -1
View File
@@ -10,4 +10,4 @@ SET(CMAKE_SWIG_FLAGS "")
SET_SOURCE_FILES_PROPERTIES(IfcPython.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(IfcPython.i PROPERTIES CPLUSPLUS ON)
SWIG_ADD_MODULE(IfcImport python IfcPython.i) SWIG_ADD_MODULE(IfcImport python IfcPython.i)
SWIG_LINK_LIBRARIES(IfcImport ${PYTHON_LIBRARIES} IfcParse TKAdvTools TKMath TKernel TKBRep TKGeomBase TKGeomAlgo TKBool TKMesh TKShHealing) SWIG_LINK_LIBRARIES(IfcImport ${PYTHON_LIBRARIES} IfcParse TKAdvTools TKMath TKernel TKBRep TKGeomBase TKGeomAlgo TKBool TKMesh TKShHealing TKFillet)