AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

This commit is contained in:
Phillip Stephens 2019-06-20 15:45:35 -07:00
parent 47322b9496
commit d9b6be8446
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/DiscBase.cpp
View File

@ -416,7 +416,7 @@ void DiscBuilderBase::PartitionBuilderBase::recursiveMergeNodesPre(const Node* n
/* Write-through remaining dir nodes */ /* Write-through remaining dir nodes */
for (const auto& p : dirNodes) { for (const auto& p : dirNodes) {
recursiveMergeNodesPre(p.second, nullptr); recursiveMergeNodesPre(p.second, {});
} }
/* Write-through remaining file nodes */ /* Write-through remaining file nodes */
@ -501,7 +501,7 @@ bool DiscBuilderBase::PartitionBuilderBase::recursiveMergeNodes(IPartWriteStream
for (const auto& p : dirNodes) { for (const auto& p : dirNodes) {
SystemStringConv sysName(p.second->getName()); SystemStringConv sysName(p.second->getName());
SystemString chKeyPath = SystemString(keyPath) + _SYS_STR('/') + sysName.c_str(); SystemString chKeyPath = SystemString(keyPath) + _SYS_STR('/') + sysName.c_str();
if (!recursiveMergeNodes(ws, system, p.second, nullptr, chKeyPath)) if (!recursiveMergeNodes(ws, system, p.second, {}, chKeyPath))
return false; return false;
} }
@ -623,7 +623,7 @@ bool DiscBuilderBase::PartitionBuilderBase::recursiveMergeFST(const Node* nodeIn
addBuildName(sysName.sys_str()); addBuildName(sysName.sys_str());
incParents(); incParents();
if (!recursiveMergeFST(p.second, nullptr, if (!recursiveMergeFST(p.second, {},
[&]() { [&]() {
m_buildNodes[dirNodeIdx].incrementLength(); m_buildNodes[dirNodeIdx].incrementLength();
incParents(); incParents();
@ -688,7 +688,7 @@ bool DiscBuilderBase::PartitionBuilderBase::RecursiveCalculateTotalSize(uint64_t
/* Write-through remaining dir nodes */ /* Write-through remaining dir nodes */
for (const auto& p : dirNodes) { for (const auto& p : dirNodes) {
if (!RecursiveCalculateTotalSize(totalSz, p.second, nullptr)) if (!RecursiveCalculateTotalSize(totalSz, p.second, {}))
return false; return false;
} }