1) Added support for IFC4x1 (see issue IfcOpenShell#504 (comment)).

atibaut · aothms · commit 636b2aafdf10 · 2019-06-26T12:44:26.000+02:00
2) New build parameters (flags) introduced for use of IFC4x1 and IFC4x2: USE_IFC4X2 (for use of IfcBridge), USE_IFC4X1 (for use of IfcAlignment)

This explains new parameters (flags):
#ifdef USE_IFC4X2
#include "../ifcparse/Ifc4x2enum.h"
#elif USE_IFC4X1
#include "../ifcparse/Ifc4x1enum.h"
#elif USE_IFC4
#include "../ifcparse/Ifc4enum.h"
#else
#include "../ifcparse/Ifc2x3enum.h"
#endif

3) Added comment block  "This file is part of IfcOpenShell. ..." at the beggining of the Ifc4x2* files.
diff --git a/src/ifcparse/Argument.h b/src/ifcparse/Argument.h
@@ -28,7 +28,11 @@
 
 #include "ifc_parse_api.h"
 
-#ifdef USE_IFC4
+#ifdef USE_IFC4X2
+#include "../ifcparse/Ifc4x2enum.h"
+#elif USE_IFC4X1
+#include "../ifcparse/Ifc4x1enum.h"
+#elif USE_IFC4
 #include "../ifcparse/Ifc4enum.h"
 #else
 #include "../ifcparse/Ifc2x3enum.h"
diff --git a/src/ifcparse/Ifc4x1-schema.cpp b/src/ifcparse/Ifc4x1-schema.cpp
diff --git a/src/ifcparse/Ifc4x1.cpp b/src/ifcparse/Ifc4x1.cpp
diff --git a/src/ifcparse/Ifc4x1.h b/src/ifcparse/Ifc4x1.h
diff --git a/src/ifcparse/Ifc4x1enum.h b/src/ifcparse/Ifc4x1enum.h
@@ -0,0 +1,35 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * This file has been generated from IFC4x1.exp. Do not make modifications  *
+ * but instead modify the python script that has been used to generate this.    *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFC4X1ENUM_H
+#define IFC4X1ENUM_H
+
+#include "../ifcparse/ifc_parse_api.h"
+
+#include <string>
+#include <boost/optional.hpp>
+
+#endif
diff --git a/src/ifcparse/Ifc4x2-schema.cpp b/src/ifcparse/Ifc4x2-schema.cpp
@@ -1,3 +1,28 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * This file has been generated from IFC4x2.exp Draft. Do not make modifications  *
+ * but instead modify the python script that has been used to generate this.    *
+ *                                                                              *
+ ********************************************************************************/
 
 #include "../ifcparse/IfcSchema.h"
 #include "../ifcparse/Ifc4x2.h"
diff --git a/src/ifcparse/Ifc4x2.cpp b/src/ifcparse/Ifc4x2.cpp
@@ -1,3 +1,28 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * This file has been generated from IFC4x2.exp Draft. Do not make modifications  *
+ * but instead modify the python script that has been used to generate this.    *
+ *                                                                              *
+ ********************************************************************************/
 
 #include "../ifcparse/Ifc4x2.h"
 #include "../ifcparse/IfcSchema.h"
diff --git a/src/ifcparse/Ifc4x2.h b/src/ifcparse/Ifc4x2.h
@@ -1,3 +1,28 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * This file has been generated from IFC4x2.exp Draft. Do not make modifications  *
+ * but instead modify the python script that has been used to generate this.    *
+ *                                                                              *
+ ********************************************************************************/
 
 #ifndef IFC4X2_H
 #define IFC4X2_H
diff --git a/src/ifcparse/Ifc4x2enum.h b/src/ifcparse/Ifc4x2enum.h
@@ -1,3 +1,28 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * This file has been generated from IFC4x2.exp (Draft). Do not make modifications  *
+ * but instead modify the python script that has been used to generate this.    *
+ *                                                                              *
+ ********************************************************************************/
 
 #ifndef IFC4X2ENUM_H
 #define IFC4X2ENUM_H
diff --git a/src/ifcparse/IfcBaseClass.h b/src/ifcparse/IfcBaseClass.h
@@ -22,7 +22,11 @@
 
 #include "ifc_parse_api.h"
 
-#ifdef USE_IFC4
+#ifdef USE_IFC4X2
+#include "../ifcparse/Ifc4x2enum.h"
+#elif USE_IFC4X1
+#include "../ifcparse/Ifc4x1enum.h"
+#elif USE_IFC4
 #include "../ifcparse/Ifc4enum.h"
 #else
 #include "../ifcparse/Ifc2x3enum.h"
diff --git a/src/ifcparse/IfcEntityDescriptor.h b/src/ifcparse/IfcEntityDescriptor.h
@@ -31,7 +31,11 @@
 #include "../ifcparse/IfcBaseClass.h"
 #include "../ifcparse/IfcException.h"
 
-#ifdef USE_IFC4
+#ifdef USE_IFC4X2
+#include "../ifcparse/Ifc4x2enum.h"
+#elif USE_IFC4X1
+#include "../ifcparse/Ifc4x1enum.h"
+#elif USE_IFC4
 #include "../ifcparse/Ifc4enum.h"
 #else
 #include "../ifcparse/Ifc2x3enum.h"
diff --git a/src/ifcparse/IfcHierarchyHelper.h b/src/ifcparse/IfcHierarchyHelper.h
@@ -34,6 +34,9 @@
 
 #include "../ifcparse/Ifc2x3.h"
 #include "../ifcparse/Ifc4.h"
+#include "../ifcparse/Ifc4x1.h"
+#include "../ifcparse/Ifc4x2.h"
+
 
 #include "../ifcparse/IfcFile.h"
 #include "../ifcparse/IfcWrite.h"
@@ -54,6 +57,14 @@ namespace {
 		return t->RelatingStructure();
 	}
 
+	Ifc4x1::IfcObjectDefinition* get_parent_of_relation(Ifc4x1::IfcRelContainedInSpatialStructure* t) {
+		return t->RelatingStructure();
+	}
+
+	Ifc4x2::IfcObjectDefinition* get_parent_of_relation(Ifc4x2::IfcRelContainedInSpatialStructure* t) {
+		return t->RelatingStructure();
+	}
+
 	IfcEntityList::ptr get_children_of_relation(IfcUtil::IfcBaseClass* t) {
 		return *t->data().getArgument(
 			t->declaration().as_entity()->attribute_index("RelatedElements")
@@ -299,4 +310,4 @@ inline void IfcHierarchyHelper::addRelatedObject <typename Schema::IfcRelDefines
 }
 */
 
-#endif
+#endif
diff --git a/src/ifcparse/IfcSchema.h b/src/ifcparse/IfcSchema.h
@@ -29,12 +29,18 @@
 
 #include "../ifcparse/IfcException.h"
 
-#ifdef USE_IFC4
+
+#ifdef USE_IFC4X2
+#include "../ifcparse/Ifc4x2enum.h"
+#elif USE_IFC4X1
+#include "../ifcparse/Ifc4x1enum.h"
+#elif USE_IFC4
 #include "../ifcparse/Ifc4enum.h"
 #else
 #include "../ifcparse/Ifc2x3enum.h"
 #endif
 
+
 // Forward declarations
 class IfcEntityInstanceData;
 
