Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-12 10:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address conflicts in ifcparse

Browse Source
This commit is contained in:
Thomas Krijnen
2017-12-11 14:47:30 +01:00
parent 988094b796
commit 0468f12051
10 changed files with 93 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcLogger.cpp
+6 -4
View File
@@ -38,19 +38,21 @@ void Logger::SetOutput(std::ostream* l1, std::ostream* l2) {
}
}
void Logger::Message(Logger::Severity type, const std::string& message, IfcEntityInstanceData* entity) {
void Logger::Message(Logger::Severity type, const std::string& message, IfcUtil::IfcBaseClass* instance) {
if ( log2 && type >= verbosity ) {
(*log2) << "[" << severity_strings[type] << "] ";
if ( current_product ) {
(*log2) << "{" << (*current_product)->GlobalId() << "} ";
}
(*log2) << message << std::endl;
if ( entity ) (*log2) << entity->toString() << std::endl;
if (instance) {
(*log2) << instance->data().toString() << std::endl;
}
}
}
void Logger::Message(Logger::Severity type, const std::exception& exception, IfcEntityInstanceData* entity) {
Message(type, exception.what(), entity);
void Logger::Message(Logger::Severity type, const std::exception& exception, IfcUtil::IfcBaseClass* instance) {
Message(type, exception.what(), instance);
}
void Logger::Status(const std::string& message, bool new_line) {