mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-22 07:58:30 +00:00
Merge remote-tracking branch 'origin/v0.8.0' into ifcviewer-wgpu
This commit is contained in:
@@ -24,9 +24,9 @@ namespace rocksdb {
|
||||
#include "map_transformer.h"
|
||||
#include "set_to_map_transformer.h"
|
||||
#include "file_open_status.h"
|
||||
#include "IfcLogger.h"
|
||||
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
||||
#include <functional>
|
||||
#include <variant>
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
@@ -38,7 +38,6 @@ namespace rocksdb {
|
||||
#include <iostream>
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
#include <deque>
|
||||
#include <list>
|
||||
#include <mutex>
|
||||
#include <set>
|
||||
@@ -413,6 +412,10 @@ namespace ifcopenshell {
|
||||
return std::move(read_simple_type_instances);
|
||||
}
|
||||
|
||||
ifcopenshell::spf_lexer* tokens;
|
||||
std::reference_wrapper<Logger> logger_;
|
||||
// IfcParse::FileReader* stream;
|
||||
|
||||
// Either one of these needs to be set
|
||||
ifcopenshell::file* file;
|
||||
const ifcopenshell::schema_definition* schema;
|
||||
@@ -427,7 +430,7 @@ namespace ifcopenshell {
|
||||
typedef inverse_index entities_by_ref_t;
|
||||
typedef entity_instance_by_name_t::iterator iterator;
|
||||
|
||||
in_memory_file_storage(ifcopenshell::file* owner_file = nullptr) : file(owner_file), schema(nullptr), byid_read_(&byid_, [this](const shared_pointer_type& data) { return express::Base(data); }) {};
|
||||
in_memory_file_storage(ifcopenshell::file* owner_file = nullptr, Logger& logger = Logger::Root()) : logger_(logger), file(owner_file), schema(nullptr), byid_read_(&byid_, [this](const shared_pointer_type& data) { return express::Base(data); }) {};
|
||||
in_memory_file_storage(const in_memory_file_storage& other) = delete;
|
||||
in_memory_file_storage(const in_memory_file_storage&& other) = delete;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user