Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-17 05:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.6.0' into v0.7.0

Browse Source 
# Conflicts:
#	src/ifcgeom/IfcGeomTree.h
#	src/ifcgeom_schema_agnostic/IfcGeomIterator.h
#	src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
#	src/ifcgeom_schema_agnostic/IteratorImplementation.h
#	src/ifcparse/Ifc4x3_rc3.cpp
#	src/ifcparse/Ifc4x3_rc3.h
#	src/serializers/SvgSerializer.cpp
This commit is contained in:
Thomas Krijnen
2021-08-10 14:30:07 +02:00
parent 83d5effb49 cb95c93424
commit 43f528ce04
299 changed files with 23606 additions and 2849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom_schema_agnostic/IfcGeomIterator.h
+3 -3
View File
@@ -45,7 +45,7 @@
* *
* IfcGeom::Iterator::get() *
* returns a pointer to the current IfcGeom::Element *
* *
* *
* IfcGeom::Iterator::next() *
* returns true iff a following entity is available for a successive call to *
* IfcGeom::Iterator::get() *
@@ -69,8 +69,8 @@
#endif
namespace IfcGeom {
class Iterator {
class IFC_GEOM_API Iterator {
private:
Iterator(const Iterator&); // N/I
Iterator& operator=(const Iterator&); // N/I
src/ifcgeom_schema_agnostic/IteratorImplementation.cpp
+6 -6
View File
@@ -2,7 +2,7 @@
#include <boost/algorithm/string/case_conv.hpp>
IteratorFactoryImplementation& iterator_implementations() {
IFC_GEOM_API IteratorFactoryImplementation& iterator_implementations() {
static IteratorFactoryImplementation impl;
return impl;
}
@@ -34,19 +34,19 @@ extern void init_IteratorImplementation_Ifc4x3_rc2(IteratorFactoryImplementation
IteratorFactoryImplementation::IteratorFactoryImplementation() {
#ifdef HAS_SCHEMA_2x3
init_IteratorImplementation_Ifc2x3(this);
#endif
#endif
#ifdef HAS_SCHEMA_4
init_IteratorImplementation_Ifc4(this);
#endif
#endif
#ifdef HAS_SCHEMA_4x1
init_IteratorImplementation_Ifc4x1(this);
#endif
#endif
#ifdef HAS_SCHEMA_4x2
init_IteratorImplementation_Ifc4x2(this);
#endif
#endif
#ifdef HAS_SCHEMA_4x3_rc1
init_IteratorImplementation_Ifc4x3_rc1(this);
#endif
#endif
#ifdef HAS_SCHEMA_4x3_rc2
init_IteratorImplementation_Ifc4x3_rc2(this);
#endif
src/ifcgeom_schema_agnostic/IteratorImplementation.h
+2 -2
View File
@@ -22,7 +22,7 @@ namespace IfcGeom {
typedef boost::function4<IfcGeom::IteratorImplementation*, const IfcGeom::IteratorSettings&, IfcParse::IfcFile*, const std::vector<IfcGeom::filter_t>&, int> iterator_fn;
class IteratorFactoryImplementation : public std::map<std::string, iterator_fn> {
class IFC_GEOM_API IteratorFactoryImplementation : public std::map<std::string, iterator_fn> {
public:
IteratorFactoryImplementation();
void bind(const std::string& schema_name, iterator_fn fn);
@@ -52,4 +52,4 @@ namespace IfcGeom {
}
#endif
#endif