summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-12-21 20:12:54 +0100
committerGitHub <noreply@github.com>2018-12-21 20:12:54 +0100
commite75e8b9580581d1258154d51ac03893386a500e5 (patch)
tree625619fea43e1340d39132f660a476c291974860 /src/core
parentMerge pull request #1920 from heapo/texture_format_selection (diff)
parenthopefully fix clang format issue (diff)
downloadyuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar.gz
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar.bz2
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar.lz
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar.xz
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.tar.zst
yuzu-e75e8b9580581d1258154d51ac03893386a500e5.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/savedata_factory.cpp1
-rw-r--r--src/core/hle/kernel/object.cpp1
-rw-r--r--src/core/memory.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp
index bd50fedc7..d63b7f19b 100644
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@@ -128,6 +128,7 @@ std::string SaveDataFactory::GetFullPath(SaveDataSpaceId space, SaveDataType typ
return fmt::format("{}save/cache/{:016X}", out, title_id);
default:
ASSERT_MSG(false, "Unrecognized SaveDataType: {:02X}", static_cast<u8>(type));
+ return fmt::format("{}save/unknown_{:X}/{:016X}", out, static_cast<u8>(type), title_id);
}
}
diff --git a/src/core/hle/kernel/object.cpp b/src/core/hle/kernel/object.cpp
index 0ea851a74..806078638 100644
--- a/src/core/hle/kernel/object.cpp
+++ b/src/core/hle/kernel/object.cpp
@@ -32,6 +32,7 @@ bool Object::IsWaitable() const {
}
UNREACHABLE();
+ return false;
}
} // namespace Kernel
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 643afdee8..e9166dbd9 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -187,6 +187,7 @@ T Read(const VAddr vaddr) {
default:
UNREACHABLE();
}
+ return {};
}
template <typename T>