yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #5247 from comex/xx-concepts 

k_priority_queue: Fix concepts use
This commit is contained in:
bunnei 2020-12-29 16:50:20 -08:00 committed by GitHub
parent b02464f685 388cf58b31
commit 85cfd96f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/concepts.h
View File

@ -31,4 +31,8 @@ concept DerivedFrom = requires {
std::is_convertible_v<const volatile Derived*, const volatile Base*>; std::is_convertible_v<const volatile Derived*, const volatile Base*>;
}; };
// TODO: Replace with std::convertible_to when libc++ implements it.
template <typename From, typename To>
concept ConvertibleTo = std::is_convertible_v<From, To>;
} // namespace Common } // namespace Common

8
src/core/hle/kernel/k_priority_queue.h
View File

@ -8,11 +8,13 @@
#pragma once #pragma once
#include <array> #include <array>
#include <concepts>
#include "common/assert.h" #include "common/assert.h"
#include "common/bit_set.h" #include "common/bit_set.h"
#include "common/bit_util.h" #include "common/bit_util.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/concepts.h"
namespace Kernel { namespace Kernel {
@ -21,7 +23,7 @@ class Thread;
template <typename T> template <typename T>
concept KPriorityQueueAffinityMask = !std::is_reference_v<T> && requires(T & t) { concept KPriorityQueueAffinityMask = !std::is_reference_v<T> && requires(T & t) {
{ t.GetAffinityMask() } { t.GetAffinityMask() }
->std::convertible_to<u64>; ->Common::ConvertibleTo<u64>;
{t.SetAffinityMask(std::declval<u64>())}; {t.SetAffinityMask(std::declval<u64>())};
{ t.GetAffinity(std::declval<int32_t>()) } { t.GetAffinity(std::declval<int32_t>()) }
@ -48,9 +50,9 @@ concept KPriorityQueueMember = !std::is_reference_v<T> && requires(T & t) {
->KPriorityQueueAffinityMask; ->KPriorityQueueAffinityMask;
{ t.GetActiveCore() } { t.GetActiveCore() }
->std::convertible_to<s32>; ->Common::ConvertibleTo<s32>;
{ t.GetPriority() } { t.GetPriority() }
->std::convertible_to<s32>; ->Common::ConvertibleTo<s32>;
}; };
template <typename Member, size_t _NumCores, int LowestPriority, int HighestPriority> template <typename Member, size_t _NumCores, int LowestPriority, int HighestPriority>