drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Merge commit '22e6299e90e85cb2b5ee814ebf2324b1a74d7091'

Browse Source
This commit is contained in:
Gary Talent
2024-04-24 23:12:54 -05:00
parent eecc9da3ce 22e6299e90
commit 35c97cfb67
184 changed files with 1262 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp vendored
View File

@@ -117,7 +117,7 @@ class AssetRef: public ox::SignalHandler {
}
if (m_ctr) {
m_ctr->decRefs();
oxIgnoreError(m_ctr->updated.disconnectObject(this));
std::ignore = m_ctr->updated.disconnectObject(this);
}
m_ctr = h.m_ctr;
if (m_ctr) {
@@ -133,11 +133,11 @@ class AssetRef: public ox::SignalHandler {
}
if (m_ctr) {
m_ctr->decRefs();
oxIgnoreError(m_ctr->updated.disconnectObject(this));
std::ignore = m_ctr->updated.disconnectObject(this);
}
m_ctr = h.m_ctr;
if (m_ctr) {
oxIgnoreError(m_ctr->updated.disconnectObject(&h));
std::ignore = m_ctr->updated.disconnectObject(&h);
m_ctr->updated.connect(this, &AssetRef::emitUpdated);
}
h.m_ctr = nullptr;

2
deps/nostalgia/src/olympic/keel/src/keel.cpp vendored
View File

@@ -11,7 +11,7 @@ ox::Error init(
ox::UPtr<ox::FileSystem> &&fs,
ox::CRStringView appName) noexcept {
ctx.appName = appName;
oxIgnoreError(setRomFs(ctx, std::move(fs)));
std::ignore = setRomFs(ctx, std::move(fs));
#ifndef OX_BARE_METAL
auto const&mods = modules();
for (auto &mod : mods) {