From 710c97dea84f03fa3938e8a1d9fdaa9b0398f285 Mon Sep 17 00:00:00 2001 From: lizzie Date: Thu, 17 Sep 2026 06:50:07 +0000 Subject: [PATCH] Fix license headers --- src/common/CMakeLists.txt | 1 - src/common/concepts.h | 18 ------------------ src/common/fixed_point.h | 4 +--- src/common/fs/file.h | 10 +++++----- src/core/hle/service/hle_ipc.h | 4 ++-- .../nvdrv/devices/ioctl_serialization.h | 3 +-- src/core/loader/loader.cpp | 1 - 7 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 src/common/concepts.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 94da1724df..fabe3e0a09 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -36,7 +36,6 @@ add_library( cityhash.h common_funcs.h common_types.h - concepts.h container_hash.h demangle.cpp demangle.h diff --git a/src/common/concepts.h b/src/common/concepts.h deleted file mode 100644 index 4c07443bac..0000000000 --- a/src/common/concepts.h +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project -// SPDX-License-Identifier: GPL-3.0-or-later - -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include - -namespace Common { - -// Check if type satisfies the ContiguousContainer named requirement. -template -concept IsContiguousContainer = std::contiguous_iterator; - -} // namespace Common diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index c52c870812..7b9cab8256 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h @@ -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: 2015 Evan Teran @@ -15,8 +15,6 @@ #include #include -#include - namespace Common { // No equivalent for "std::arithmetic" in the stdlib diff --git a/src/common/fs/file.h b/src/common/fs/file.h index b1ccfbd18a..3ba3bba8bd 100644 --- a/src/common/fs/file.h +++ b/src/common/fs/file.h @@ -6,12 +6,12 @@ #pragma once +#include #include #include #include #include -#include "common/concepts.h" #include "common/fs/fs_types.h" #include "common/fs/fs_util.h" @@ -212,7 +212,7 @@ public: /** * Helper function which deduces the value type of a contiguous STL container used in ReadSpan. - * If T is not a contiguous container as defined by the concept IsContiguousContainer, this + * If T is not a contiguous container as defined by the concept, this * calls ReadObject and T must be a trivially copyable object. * * See ReadSpan for more details if T is a contiguous container. @@ -226,7 +226,7 @@ public: */ template [[nodiscard]] size_t Read(T& data) const { - if constexpr (IsContiguousContainer) { + if constexpr (std::contiguous_iterator) { using ContiguousType = typename T::value_type; static_assert(std::is_trivially_copyable_v, "Data type must be trivially copyable."); @@ -238,7 +238,7 @@ public: /** * Helper function which deduces the value type of a contiguous STL container used in WriteSpan. - * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this + * If T is not a contiguous STL container as defined by the concept, this * calls WriteObject and T must be a trivially copyable object. * * See WriteSpan for more details if T is a contiguous container. @@ -252,7 +252,7 @@ public: */ template [[nodiscard]] size_t Write(const T& data) const { - if constexpr (IsContiguousContainer) { + if constexpr (std::contiguous_iterator) { using ContiguousType = typename T::value_type; static_assert(std::is_trivially_copyable_v, "Data type must be trivially copyable."); diff --git a/src/core/hle/service/hle_ipc.h b/src/core/hle/service/hle_ipc.h index 4dee40224a..8eeecd38e9 100644 --- a/src/core/hle/service/hle_ipc.h +++ b/src/core/hle/service/hle_ipc.h @@ -6,6 +6,7 @@ #pragma once +#include #include #include #include @@ -18,7 +19,6 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/concepts.h" #include "common/swap.h" #include "core/hle/ipc.h" #include "core/hle/kernel/k_handle_table.h" @@ -294,7 +294,7 @@ public: */ template >> std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const { - if constexpr (Common::IsContiguousContainer) { + if constexpr (std::contiguous_iterator) { using ContiguousType = typename T::value_type; static_assert(std::is_trivially_copyable_v, "Container to WriteBuffer must contain trivially copyable objects"); diff --git a/src/core/hle/service/nvdrv/devices/ioctl_serialization.h b/src/core/hle/service/nvdrv/devices/ioctl_serialization.h index c3baa3a75b..7659092c86 100644 --- a/src/core/hle/service/nvdrv/devices/ioctl_serialization.h +++ b/src/core/hle/service/nvdrv/devices/ioctl_serialization.h @@ -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 2023 yuzu Emulator Project @@ -9,7 +9,6 @@ #include #include -#include "common/concepts.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia::Devices { diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 90e23ccc11..8069b8b09d 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -10,7 +10,6 @@ #include #include #include -#include "common/concepts.h" #include "common/fs/path_util.h" #include "common/logging.h" #include "common/string_util.h"