ams-libs: AMS_ASSERT no longer invokes expression

2021-09-29 21:32:40 -07:00
parent 5dc64bc1f7
commit 9b04ff0f54
38 changed files with 82 additions and 23 deletions
--- a/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.hpp
+++ b/libraries/libstratosphere/source/os/impl/os_waitable_manager_impl.hpp
@@ -49,8 +49,11 @@ namespace ams::os::impl {

            WaitableHolderBase *WaitAnyImpl(bool infinite, TimeSpan timeout) {
                WaitableHolderBase *holder = nullptr;
+
                const Result wait_result = this->WaitAnyImpl(std::addressof(holder), infinite, timeout, false, svc::InvalidHandle);
-                AMS_ASSERT(R_SUCCEEDED(wait_result));
+                R_ASSERT(wait_result);
+                AMS_UNUSED(wait_result);
+
                return holder;
            }
        public: