Эх сурвалжийг харах

ARMDynarmicInterface: Correct GCC Build Errors.

Fernando Sahmkow 6 жил өмнө
parent
commit
0a8013d71e

+ 3 - 3
src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -91,11 +91,11 @@ public:
     u64 GetTicksRemaining() override {
         if (parent.uses_wall_clock) {
             if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {
-                return std::max<s64>(1000U, 0);
+                return 1000U;
             }
-            return 0ULL;
+            return 0U;
         }
-        return std::max(parent.system.CoreTiming().GetDowncount(), 0LL);
+        return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
     }
 
     ARM_Dynarmic_32& parent;

+ 3 - 3
src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -143,11 +143,11 @@ public:
     u64 GetTicksRemaining() override {
         if (parent.uses_wall_clock) {
             if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {
-                return std::max<s64>(1000U, 0);
+                return 1000U;
             }
-            return 0ULL;
+            return 0U;
         }
-        return std::max(parent.system.CoreTiming().GetDowncount(), 0LL);
+        return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
     }
 
     u64 GetCNTPCT() override {