ams: basic support for compiling with gcc 15

This commit is contained in:
Michael Scire
2025-04-26 14:53:08 -07:00
committed by SciresM
parent 49058b204c
commit 29cadcd269
9 changed files with 11 additions and 16 deletions

View File

@@ -282,7 +282,7 @@ namespace ams::ncm {
}
const FragmentSet *GetFragmentSet(s32 delta_index, s32 fragment_set_index) const {
return reinterpret_cast<const FragmentSet *>(this->GetFragmentSetIndex(delta_index, fragment_set_index));
return reinterpret_cast<const FragmentSet *>(this->GetFragmentSetAddress(delta_index, fragment_set_index));
}
const FragmentIndicator *GetFragmentIndicator(s32 delta_index, s32 fragment_set_index, s32 index) const {

View File

@@ -33,14 +33,14 @@ namespace ams::fs {
}
ALWAYS_INLINE ScopedSetter(ScopedSetter &&rhs) {
m_ptr = rhs.ptr;
m_value = rhs.value;
m_ptr = rhs.m_ptr;
m_value = rhs.m_value;
rhs.Reset();
}
ALWAYS_INLINE ScopedSetter &operator=(ScopedSetter &&rhs) {
m_ptr = rhs.ptr;
m_value = rhs.value;
m_ptr = rhs.m_ptr;
m_value = rhs.m_value;
rhs.Reset();
return *this;
}

View File

@@ -21,7 +21,7 @@ namespace ams::sf::hipc {
#if AMS_SF_MITM_SUPPORTED
Result ServerManagerBase::InstallMitmServerImpl(os::NativeHandle *out_port_handle, sm::ServiceName service_name, ServerManagerBase::MitmQueryFunction query_func) {
/* Install the Mitm. */
os::NativeHandle query_handle;
os::NativeHandle query_handle = os::InvalidNativeHandle;
R_TRY(sm::mitm::InstallMitm(out_port_handle, std::addressof(query_handle), service_name));
/* Register the query handle. */