Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-14 11:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Thomas Krijnen
2017-12-11 14:20:30 +01:00
parent f36d27f7af
commit 988094b796
9 changed files with 2602 additions and 2578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcFile.h
+1 -1
View File
@@ -64,7 +64,6 @@ public:
private:
typedef std::map<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*> entity_entity_map_t;
bool parsing_complete_;
const schema_definition* schema_;
entity_by_id_t byid;
@@ -171,6 +170,7 @@ public:
void register_inverse(unsigned, Token);
void register_inverse(unsigned, IfcUtil::IfcBaseClass*);
void unregister_inverse(unsigned, IfcUtil::IfcBaseClass*);
const schema_definition* schema() const { return schema_; }
};