Initialize header schema in constructor and not statically #7131

aothms · aothms · commit 2b24d5ebe50d · 2025-09-23T10:26:01.000+02:00
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
@@ -72,6 +72,8 @@ IfcParse::IfcSpfHeader::IfcSpfHeader(IfcParse::IfcFile* file)
     file_name_(nullptr),
     file_schema_(nullptr)
 {
+    Header_section_schema::get_schema();
+
     if (file == nullptr) {
         // overwritten later in IfcFile::setDefaultHeaderValues() when we know the schema identifier
         file_description_ = new Header_section_schema::file_description({}, "");
@@ -101,6 +103,8 @@ IfcParse::IfcSpfHeader::IfcSpfHeader(IfcParse::IfcFile* file)
 
 IfcParse::IfcSpfHeader::IfcSpfHeader(IfcParse::IfcSpfLexer* lexer)
 {
+    Header_section_schema::get_schema();
+
 	storage_ = new impl::in_memory_file_storage;
 	storage_->tokens = lexer;
     file_ = nullptr;
@@ -284,5 +288,3 @@ Header_section_schema::file_schema* IfcParse::IfcSpfHeader::file_schema() {
 
     return file_schema_; 
 }
-
-static auto& _ = Header_section_schema::get_schema();
