Skip to content

Commit becd38c

Browse files
aothmsaothms
committed
Compilation fixes
1 parent 7d6c6bd commit becd38c

File tree

12 files changed

+24
-24
lines changed

12 files changed

+24
-24
lines changed

‎src/examples/IfcAdvancedHouse.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#define IfcSchema Ifc2x3
4242
#include "../ifcparse/macros.h"
43-
#include "../ifcparse/Ifc2x3.h"
43+
#include "../ifcparse/schemas/Ifc2x3.h"
4444
#include "../ifcparse/hierarchy_helper.h"
4545

4646
#include "../ifcgeom/Serialization/Serialization.h"

‎src/examples/IfcOpenHouse.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
#define IfcSchema Ifc2x3
3939
#include "../ifcparse/macros.h"
40-
#include "../ifcparse/Ifc2x3.h"
40+
#include "../ifcparse/schemas/Ifc2x3.h"
4141
#include "../ifcparse/hierarchy_helper.h"
4242

4343
#include "../ifcgeom/Serialization/Serialization.h"

‎src/examples/IfcParseExamples.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "../ifcparse/file.h"
2424
#include "../ifcparse/logger.h"
25-
#include "../ifcparse/Ifc2x3.h"
25+
#include "../ifcparse/schemas/Ifc2x3.h"
2626

2727
#include <boost/preprocessor/stringize.hpp>
2828
#include <boost/preprocessor/seq/for_each.hpp>
@@ -47,7 +47,7 @@ static_assert(false, "A boost preprocessor sequence of schema identifiers is nee
4747
// for and then overflow into an existing empty include file.
4848

4949
#define INCLUDE_SCHEMA(n) \
50-
BOOST_PP_IIF(BOOST_PP_GREATER(BOOST_PP_SEQ_SIZE(SCHEMA_SEQ), n), BOOST_PP_STRINGIZE(../ifcparse/BOOST_PP_CAT(Ifc,BOOST_PP_SEQ_ELEM(BOOST_PP_MIN(n, BOOST_PP_SEQ_SIZE(BOOST_PP_SEQ_POP_BACK(SCHEMA_SEQ))),SCHEMA_SEQ)).h), "../ifcgeom/empty.h")
50+
BOOST_PP_IIF(BOOST_PP_GREATER(BOOST_PP_SEQ_SIZE(SCHEMA_SEQ), n), BOOST_PP_STRINGIZE(../ifcparse/schemas/BOOST_PP_CAT(Ifc,BOOST_PP_SEQ_ELEM(BOOST_PP_MIN(n, BOOST_PP_SEQ_SIZE(BOOST_PP_SEQ_POP_BACK(SCHEMA_SEQ))),SCHEMA_SEQ)).h), "../ifcgeom/empty.h")
5151

5252
#include INCLUDE_SCHEMA(0)
5353
#include INCLUDE_SCHEMA(1)

‎src/examples/arbitrary_open_profile_def.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <iostream>
2929
#include <fstream>
3030

31-
#include "../ifcparse/Ifc2x3.h"
31+
#include "../ifcparse/schemas/Ifc2x3.h"
3232
#include "../ifcparse/IfcUtil.h"
3333
#include "../ifcparse/hierarchy_helper.h"
3434

‎src/examples/composite_profile_def.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <iostream>
2828
#include <fstream>
2929

30-
#include "../ifcparse/Ifc2x3.h"
30+
#include "../ifcparse/schemas/Ifc2x3.h"
3131
#include "../ifcparse/IfcUtil.h"
3232
#include "../ifcparse/hierarchy_helper.h"
3333

‎src/examples/csg_primitive.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <iostream>
2828
#include <fstream>
2929

30-
#include "../ifcparse/Ifc2x3.h"
30+
#include "../ifcparse/schemas/Ifc2x3.h"
3131
#include "../ifcparse/IfcUtil.h"
3232
#include "../ifcparse/hierarchy_helper.h"
3333

‎src/examples/ellipse_pies.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <iostream>
2828
#include <fstream>
2929

30-
#include "../ifcparse/Ifc2x3.h"
30+
#include "../ifcparse/schemas/Ifc2x3.h"
3131
#include "../ifcparse/IfcUtil.h"
3232
#include "../ifcparse/hierarchy_helper.h"
3333

‎src/examples/faces.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* *
2424
********************************************************************************/
2525

26-
#include "../ifcparse/Ifc2x3.h"
26+
#include "../ifcparse/schemas/Ifc2x3.h"
2727
#include "../ifcparse/IfcUtil.h"
2828
#include "../ifcparse/hierarchy_helper.h"
2929

@@ -204,4 +204,4 @@ int main(int argc, char** argv) {
204204
file.header().file_name().name(filename);
205205
std::ofstream f(filename.c_str());
206206
f << file;
207-
}
207+
}

‎src/examples/profiles.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <iostream>
2828
#include <fstream>
2929

30-
#include "../ifcparse/Ifc2x3.h"
30+
#include "../ifcparse/schemas/Ifc2x3.h"
3131
#include "../ifcparse/IfcUtil.h"
3232
#include "../ifcparse/hierarchy_helper.h"
3333

‎src/ifcparse/parse.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,19 +1408,19 @@ void parse_header(
14081408
read_terminal(lexer, HEADER, true);
14091409

14101410
read_terminal(lexer, Header_section_schema::file_description::Class().name_uc(), false);
1411-
header.set_file_description(read_header_entity(header.file(), storage, lexer, references_to_resolve, Header_section_schema::file_description::Class()));
1411+
header.set_file_description(read_header_entity(header.owner_file(), storage, lexer, references_to_resolve, Header_section_schema::file_description::Class()));
14121412
if (!lexer.next().is_operator(';')) {
14131413
throw exception("Expected ;");
14141414
}
14151415

14161416
read_terminal(lexer, Header_section_schema::file_name::Class().name_uc(), false);
1417-
header.set_file_name(read_header_entity(header.file(), storage, lexer, references_to_resolve, Header_section_schema::file_name::Class()));
1417+
header.set_file_name(read_header_entity(header.owner_file(), storage, lexer, references_to_resolve, Header_section_schema::file_name::Class()));
14181418
if (!lexer.next().is_operator(';')) {
14191419
throw exception("Expected ;");
14201420
}
14211421

14221422
read_terminal(lexer, Header_section_schema::file_schema::Class().name_uc(), false);
1423-
header.set_file_schema(read_header_entity(header.file(), storage, lexer, references_to_resolve, Header_section_schema::file_schema::Class()));
1423+
header.set_file_schema(read_header_entity(header.owner_file(), storage, lexer, references_to_resolve, Header_section_schema::file_schema::Class()));
14241424
if (!lexer.next().is_operator(';')) {
14251425
throw exception("Expected ;");
14261426
}
@@ -1452,7 +1452,7 @@ spf_header& ifcopenshell::instance_streamer<Reader>::ensure_header() {
14521452

14531453
if (owner_ != nullptr) {
14541454
header_ = &owner_->header();
1455-
header_->file(owner_);
1455+
header_->owner_file(owner_);
14561456
} else {
14571457
owned_header_ = std::make_unique<spf_header>(owner_);
14581458
header_ = owned_header_.get();
@@ -1859,7 +1859,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
18591859
auto& storage = byid_[p.first.name_];
18601860
auto attr_index = p.first.index_;
18611861

1862-
if (storage->has_attribute_value<express::Base>(attr_index)) {
1862+
if (storage->template has_attribute_value<express::Base>(attr_index)) {
18631863
express::Base inst = storage->get_attribute_value(attr_index);
18641864
if (!inst.declaration().as_entity()) {
18651865
// Probably a case of IfcPropertySetDefinitionSet, divert storage of reference to the simply type instance
@@ -1868,7 +1868,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
18681868
}
18691869
}
18701870

1871-
if (storage->has_attribute_value<blank>(attr_index)) {
1871+
if (storage->template has_attribute_value<blank>(attr_index)) {
18721872
storage->set_attribute_value(attr_index, express::Base(it->second));
18731873
} else {
18741874
logger::error("Duplicate definition for instance reference");
@@ -1899,7 +1899,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
18991899
auto& storage = byid_[p.first.name_];
19001900
auto attr_index = p.first.index_;
19011901

1902-
if (storage->has_attribute_value<express::Base>(attr_index)) {
1902+
if (storage->template has_attribute_value<express::Base>(attr_index)) {
19031903
express::Base inst = storage->get_attribute_value(attr_index);
19041904
if (!inst.declaration().as_entity()) {
19051905
// Probably a case of IfcPropertySetDefinitionSet, divert storage of reference to the simply type instance
@@ -1908,7 +1908,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
19081908
}
19091909
}
19101910

1911-
if (storage->has_attribute_value<blank>(attr_index)) {
1911+
if (storage->template has_attribute_value<blank>(attr_index)) {
19121912
storage->set_attribute_value(attr_index, instances);
19131913
} else {
19141914
logger::error("Duplicate definition for instance reference");
@@ -1937,7 +1937,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
19371937
auto& storage = byid_[p.first.name_];
19381938
auto attr_index = p.first.index_;
19391939

1940-
if (storage->has_attribute_value<express::Base>(attr_index)) {
1940+
if (storage->template has_attribute_value<express::Base>(attr_index)) {
19411941
express::Base inst = storage->get_attribute_value(attr_index);
19421942
if (!inst.declaration().as_entity()) {
19431943
// Probably a case of IfcPropertySetDefinitionSet, divert storage of reference to the simply type instance
@@ -1946,7 +1946,7 @@ void ifcopenshell::impl::in_memory_file_storage::read_from_stream(Reader* s, con
19461946
}
19471947
}
19481948

1949-
if (storage->has_attribute_value<blank>(attr_index)) {
1949+
if (storage->template has_attribute_value<blank>(attr_index)) {
19501950
storage->set_attribute_value(attr_index, instances);
19511951
} else {
19521952
logger::error("Duplicate definition for instance reference");

0 commit comments

Comments
 (0)