Procházet zdrojové kódy

kernel: fix compilation with older gcc

Liam před 3 roky
rodič
revize
82c2a3da9f

+ 4 - 4
src/core/hle/kernel/k_capabilities.cpp

@@ -203,23 +203,23 @@ Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) {
 
 
 Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) {
 Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) {
     // Map each region into the process's page table.
     // Map each region into the process's page table.
-    R_RETURN(ProcessMapRegionCapability(
+    return ProcessMapRegionCapability(
         cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
         cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
             // R_RETURN(page_table->MapRegion(region_type, perm));
             // R_RETURN(page_table->MapRegion(region_type, perm));
             UNIMPLEMENTED();
             UNIMPLEMENTED();
             R_SUCCEED();
             R_SUCCEED();
-        }));
+        });
 }
 }
 
 
 Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) {
 Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) {
     // Check that each region has a physical backing store.
     // Check that each region has a physical backing store.
-    R_RETURN(ProcessMapRegionCapability(
+    return ProcessMapRegionCapability(
         cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
         cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
             R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived(
             R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived(
                          region_type) != nullptr,
                          region_type) != nullptr,
                      ResultOutOfRange);
                      ResultOutOfRange);
             R_SUCCEED();
             R_SUCCEED();
-        }));
+        });
 }
 }
 
 
 Result KCapabilities::SetInterruptPairCapability(const u32 cap) {
 Result KCapabilities::SetInterruptPairCapability(const u32 cap) {

+ 1 - 0
src/core/hle/kernel/physical_core.h

@@ -3,6 +3,7 @@
 
 
 #pragma once
 #pragma once
 
 
+#include <condition_variable>
 #include <cstddef>
 #include <cstddef>
 #include <memory>
 #include <memory>
 #include <mutex>
 #include <mutex>