VERY experimental Nintendo Switch 2 emulator
C++
[common] Use `std::make_unique_for_overwrite<T>` in ScratchBuffer, remove polyfill (#4432)
lizziebebc19da3253
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txtindex 94da1724df..0517f0b9e1 100644--- a/src/common/CMakeLists.txt+++ b/src/common/CMakeLists.txt@@ -76,7 +76,6 @@ add_library(logging.hlz4_compression.cpplz4_compression.h- make_unique_for_overwrite.hmath_util.hmemory_detect.cppmemory_detect.hdiff --git a/src/common/make_unique_for_overwrite.h b/src/common/make_unique_for_overwrite.hdeleted file mode 100644index 17f81bba4a..0000000000--- a/src/common/make_unique_for_overwrite.h+++ /dev/null@@ -1,27 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#pragma once--#include <memory>-#include <type_traits>--namespace Common {--template <class T>- requires(!std::is_array_v<T>)-std::unique_ptr<T> make_unique_for_overwrite() {- return std::unique_ptr<T>(new T);-}--template <class T>- requires std::is_unbounded_array_v<T>-std::unique_ptr<T> make_unique_for_overwrite(std::size_t n) {- return std::unique_ptr<T>(new std::remove_extent_t<T>[n]);-}--template <class T, class... Args>- requires std::is_bounded_array_v<T>-void make_unique_for_overwrite(Args&&...) = delete;--} // namespace Commondiff --git a/src/common/scratch_buffer.h b/src/common/scratch_buffer.hindex 8c1f566301..929a65609a 100644--- a/src/common/scratch_buffer.h+++ b/src/common/scratch_buffer.h@@ -8,8 +8,7 @@#include <iterator>#include <cstring>--#include "common/make_unique_for_overwrite.h"+#include <memory>namespace Common {@@ -38,8 +37,9 @@ public:ScratchBuffer() = default;explicit ScratchBuffer(size_type initial_capacity)- : last_requested_size{initial_capacity}, buffer_capacity{initial_capacity},- buffer{Common::make_unique_for_overwrite<T[]>(initial_capacity)} {}+ : last_requested_size{initial_capacity}+ , buffer_capacity{initial_capacity}+ , buffer{std::make_unique_for_overwrite<T[]>(initial_capacity)} {}~ScratchBuffer() = default;ScratchBuffer(const ScratchBuffer&) = delete;@@ -64,7 +64,7 @@ public:/// The previously held data will remain intact.void resize(size_type size) {if (size > buffer_capacity) {- auto new_buffer = Common::make_unique_for_overwrite<T[]>(size);+ auto new_buffer = std::make_unique_for_overwrite<T[]>(size);std::memcpy(new_buffer.get(), buffer.get(), buffer_capacity * sizeof(T));buffer = std::move(new_buffer);buffer_capacity = size;@@ -77,7 +77,7 @@ public:void resize_destructive(size_type size) {if (size > buffer_capacity) {buffer_capacity = size;- buffer = Common::make_unique_for_overwrite<T[]>(buffer_capacity);+ buffer = std::make_unique_for_overwrite<T[]>(buffer_capacity);}last_requested_size = size;}diff --git a/src/core/file_sys/vfs/vfs_real.cpp b/src/core/file_sys/vfs/vfs_real.cppindex b04f832cd3..14e0caad3c 100644--- a/src/core/file_sys/vfs/vfs_real.cpp+++ b/src/core/file_sys/vfs/vfs_real.cpp@@ -109,8 +109,7 @@ VirtualFile RealVfsFilesystem::OpenFileFromEntry(std::string_view path_, std::opauto reference = std::make_unique<FileReference>();this->InsertReferenceIntoListLocked(*reference);- auto file = std::shared_ptr<RealVfsFile>(- new RealVfsFile(*this, std::move(reference), path, perms, size, std::move(parent_path)));+ auto file = std::make_shared<RealVfsFile>(*this, std::move(reference), path, perms, size, std::move(parent_path));cache[path] = file;return file;@@ -177,7 +176,7 @@ bool RealVfsFilesystem::DeleteFile(std::string_view path_) {VirtualDir RealVfsFilesystem::OpenDirectory(std::string_view path_, OpenMode perms) {const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);- return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms));+ return std::make_shared<RealVfsDirectory>(*this, path, perms);}VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, OpenMode perms) {@@ -185,7 +184,7 @@ VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, OpenMode pif (!FS::CreateDirs(path)) {return nullptr;}- return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms));+ return std::make_shared<RealVfsDirectory>(*this, path, perms);}VirtualDir RealVfsFilesystem::CopyDirectory(std::string_view old_path_,diff --git a/src/core/file_sys/vfs/vfs_real.h b/src/core/file_sys/vfs/vfs_real.hindex 672126d7ba..a97f7d32ea 100644--- a/src/core/file_sys/vfs/vfs_real.h+++ b/src/core/file_sys/vfs/vfs_real.h@@ -82,6 +82,9 @@ class RealVfsFile : public VfsFile {friend class RealVfsFilesystem;public:+ RealVfsFile(RealVfsFilesystem& base, std::unique_ptr<FileReference> reference,+ const std::string& path, OpenMode perms = OpenMode::Read,+ std::optional<u64> size = {}, std::optional<std::string> parent_path = {});~RealVfsFile() override;std::string GetName() const override;@@ -95,9 +98,6 @@ public:bool Rename(std::string_view name) override;private:- RealVfsFile(RealVfsFilesystem& base, std::unique_ptr<FileReference> reference,- const std::string& path, OpenMode perms = OpenMode::Read,- std::optional<u64> size = {}, std::optional<std::string> parent_path = {});RealVfsFilesystem& base;std::unique_ptr<FileReference> reference;@@ -113,6 +113,8 @@ class RealVfsDirectory : public VfsDirectory {friend class RealVfsFilesystem;public:+ RealVfsDirectory(RealVfsFilesystem& base, const std::string& path,+ OpenMode perms = OpenMode::Read);~RealVfsDirectory() override;VirtualFile GetFileRelative(std::string_view relative_path) const override;@@ -138,9 +140,6 @@ public:std::map<std::string, VfsEntryType, std::less<>> GetEntries() const override;private:- RealVfsDirectory(RealVfsFilesystem& base, const std::string& path,- OpenMode perms = OpenMode::Read);-template <typename T, typename R>std::vector<std::shared_ptr<R>> IterateEntries() const;diff --git a/src/core/hle/service/psc/ovln/receiver_service.cpp b/src/core/hle/service/psc/ovln/receiver_service.cppindex d869325181..3b0b180725 100644--- a/src/core/hle/service/psc/ovln/receiver_service.cpp+++ b/src/core/hle/service/psc/ovln/receiver_service.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project@@ -24,7 +24,7 @@ IReceiverService::~IReceiverService() = default;Result IReceiverService::OpenReceiver(Out<SharedPointer<IReceiver>> out_receiver) {LOG_DEBUG(Service_PSC, "called");- *out_receiver = std::shared_ptr<IReceiver>(new IReceiver(system));+ *out_receiver = std::make_shared<IReceiver>(system);R_SUCCEED();}