From 75c26a34e1b96ba910afeec536d77fd6f294ffc7 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 22 Jul 2011 08:24:00 +0000 Subject: [PATCH] Patch by Antti Risteli (andepoikka) Compile problems on gcc ubuntu-4.4.3 + misc --- src/ifcparse/IfcParse.cpp | 3 ++- src/ifcparse/IfcParse.h | 1 + src/ifcparse/IfcSchema.h | 18 +++++++++--------- src/ifcwrap/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp index 4e263a1717..85d80e7884 100644 --- a/src/ifcparse/IfcParse.cpp +++ b/src/ifcparse/IfcParse.cpp @@ -587,7 +587,8 @@ EntityPtr Ifc::EntityById(int id) { return it->second; } 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() { file->Close(); delete file; diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h index 8ba9842a63..b8bc336085 100644 --- a/src/ifcparse/IfcParse.h +++ b/src/ifcparse/IfcParse.h @@ -256,6 +256,7 @@ namespace IfcParse { std::string error; public: IfcException(std::string e); + ~IfcException () throw (); const char* what() const throw(); }; } diff --git a/src/ifcparse/IfcSchema.h b/src/ifcparse/IfcSchema.h index c696ba624e..724b57b656 100644 --- a/src/ifcparse/IfcSchema.h +++ b/src/ifcparse/IfcSchema.h @@ -332,23 +332,23 @@ IFC_END_CLASS IFC_RENDER_CLASS(Plate) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowFitting) +IFC_RENDER_CLASS(FlowFitting) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowSegment) +IFC_RENDER_CLASS(FlowSegment) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowController) +IFC_RENDER_CLASS(FlowController) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowTerminal) +IFC_RENDER_CLASS(FlowTerminal) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowMovingDevice) +IFC_RENDER_CLASS(FlowMovingDevice) IFC_END_CLASS -IFC_RENDER_CLASS(IfcEnergyConversionDevice) +IFC_RENDER_CLASS(EnergyConversionDevice) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowStorageDevice) +IFC_RENDER_CLASS(FlowStorageDevice) IFC_END_CLASS -IFC_RENDER_CLASS(IfcFlowTreatmentDevice) +IFC_RENDER_CLASS(FlowTreatmentDevice) IFC_END_CLASS -IFC_RENDER_CLASS(IfcDistributionChamberElement) +IFC_RENDER_CLASS(DistributionChamberElement) IFC_END_CLASS IFC_RENDER_CLASS(DistributionControlElement) IFC_END_CLASS diff --git a/src/ifcwrap/CMakeLists.txt b/src/ifcwrap/CMakeLists.txt index 86fb5eff5c..c5147961d5 100644 --- a/src/ifcwrap/CMakeLists.txt +++ b/src/ifcwrap/CMakeLists.txt @@ -10,4 +10,4 @@ SET(CMAKE_SWIG_FLAGS "") SET_SOURCE_FILES_PROPERTIES(IfcPython.i PROPERTIES CPLUSPLUS ON) 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)