Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ namespace fuzzybools

auto GetSegments() const
{
const auto makeSegments = [&](int i)
const auto makeSegments = [&](size_t i)
{
return std::make_pair(points[i - 1].second, points[i].second);
};
Expand Down
5 changes: 4 additions & 1 deletion src/cpp/web-ifc/modelmanager/ModelManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ webifc::parsing::IfcLoader *webifc::manager::ModelManager::GetIfcLoader(uint32_t
const webifc::manager::LoaderSettings &webifc::manager::ModelManager::GetSettings(uint32_t modelID) const
{
if (!IsModelOpen(modelID))
return LoaderSettings();
{
static const LoaderSettings defaultSettings;
return defaultSettings;
}
return _settings[modelID];
}

Expand Down
8 changes: 4 additions & 4 deletions src/cpp/web-ifc/parsing/IfcTokenStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ namespace webifc::parsing
return true;
}

bool IfcTokenStream::SetTokenSource(std::istream &requestData)
{
return SetTokenSource([&](char* dest, size_t sourceOffset, size_t destSize) { requestData.seekg(sourceOffset); requestData.read(dest, destSize); return requestData.gcount();},true);
}
bool IfcTokenStream::SetTokenSource(std::istream &requestData)
{
return SetTokenSource([&](char* dest, size_t sourceOffset, size_t destSize) { requestData.seekg(sourceOffset); requestData.read(dest, destSize); return static_cast<uint32_t>(requestData.gcount());},true);
}

std::string_view IfcTokenStream::ReadString()
{
Expand Down