From 0838242066437a04e3aa3417cab703cc071adde6 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Tue, 27 May 2025 13:47:26 -0400 Subject: Fix cxx20 compiler errors. --- ui/util.h | 2 +- view/sharedcache/core/VirtualMemory.cpp | 2 +- view/sharedcache/core/VirtualMemory.h | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/util.h b/ui/util.h index 1037528e..5f86014b 100644 --- a/ui/util.h +++ b/ui/util.h @@ -118,7 +118,7 @@ namespace fmt template QString qformat(format_string fmt, T&&... args) { - return QString::fromStdString(vformat(fmt, make_format_args(args...))); + return QString::fromStdString(vformat(fmt, fmt::make_format_args(args...))); } } diff --git a/view/sharedcache/core/VirtualMemory.cpp b/view/sharedcache/core/VirtualMemory.cpp index 47206467..dc52bf0f 100644 --- a/view/sharedcache/core/VirtualMemory.cpp +++ b/view/sharedcache/core/VirtualMemory.cpp @@ -3,7 +3,7 @@ void VirtualMemory::MapRegion(WeakFileAccessor fileAccessor, AddressRange mappedRange, uint64_t fileOffset) { // Create a new VirtualMemoryRegion object - VirtualMemoryRegion region {fileOffset, std::move(fileAccessor)}; + VirtualMemoryRegion region(fileOffset, std::move(fileAccessor)); // TODO: How to handle overlapping regions? for (const auto& [existingRange, existingRegion] : m_regions) diff --git a/view/sharedcache/core/VirtualMemory.h b/view/sharedcache/core/VirtualMemory.h index c4eb5a70..a490fa24 100644 --- a/view/sharedcache/core/VirtualMemory.h +++ b/view/sharedcache/core/VirtualMemory.h @@ -26,6 +26,10 @@ struct VirtualMemoryRegion // NOTE: Any read through this should be seeked to `fileOffset` WeakFileAccessor fileAccessor; + VirtualMemoryRegion(uint64_t offset, WeakFileAccessor accessor) + : fileOffset(offset), fileAccessor(std::move(accessor)) {} + + VirtualMemoryRegion(const VirtualMemoryRegion&) = default; VirtualMemoryRegion& operator=(const VirtualMemoryRegion&) = default; -- cgit v1.3.1