From 75954f113190dc35bb317f8d27d64403e198eb52 Mon Sep 17 00:00:00 2001 From: Exverge Date: Mon, 13 Jul 2026 15:49:53 -0400 Subject: [PATCH] Fix compiler errors --- CMakeLists.txt | 2 +- src/common/CMakeLists.txt | 2 +- src/common/host_memory.h | 10 +++++----- src/core/device_memory.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d26063b8b9..0786dead03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,7 +408,7 @@ set(BUILD_TESTING OFF) set(ENABLE_TESTING OFF) # boost -set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant) +set(BOOST_INCLUDE_LIBRARIES algorithm bimap icl pool container heap asio headers process filesystem crc variant) AddJsonPackage(boost) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 245ce1400b..8025307496 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -228,7 +228,7 @@ if(CXX_CLANG) endif() if (BOOST_NO_HEADERS) - target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool Boost::bimap) + target_link_libraries(common PUBLIC Boost::algorithm Boost::bimap Boost::heap Boost::icl Boost::pool) else() target_link_libraries(common PUBLIC Boost::headers) endif() diff --git a/src/common/host_memory.h b/src/common/host_memory.h index 567507e710..649686b5b0 100644 --- a/src/common/host_memory.h +++ b/src/common/host_memory.h @@ -98,14 +98,14 @@ public: struct MisalignedMapping : by_vaddr { - MisalignedMapping(u64 vaddr, u64 paddr, u64 size) : vaddr(vaddr >> Core::Memory::YUZU_PAGEBITS), - size(size >> Core::Memory::YUZU_PAGEBITS), - real_paddr(paddr >> Core::Memory::YUZU_PAGEBITS) {} - VAddr vaddr; + MisalignedMapping(u64 vaddr_, u64 paddr_, u64 size_) : vaddr(vaddr_ >> Core::Memory::YUZU_PAGEBITS), + size(size_ >> Core::Memory::YUZU_PAGEBITS), + real_paddr(paddr_ >> Core::Memory::YUZU_PAGEBITS) {} + u64 vaddr; u64 size; // Real backing memory linked to this mapping - PAddr real_paddr; + u64 real_paddr; }; const MisalignedMapping* GetUnalignedMappingFromVirtual(VAddr offset) const; diff --git a/src/core/device_memory.h b/src/core/device_memory.h index f9eb2a6b27..f9fc9b0579 100644 --- a/src/core/device_memory.h +++ b/src/core/device_memory.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later