Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/DimensionalArray: Don't break clang

Browse source
This commit is contained in:
Connor McLaughlin 2020-07-08 15:40:08 +10:00
parent 532c2a0c15
commit 46dfccef81
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/common/dimensional_array.h
View file

@ -29,6 +29,9 @@ namespace detail {
template<typename T, std::size_t rank, std::size_t... sizes> template<typename T, std::size_t rank, std::size_t... sizes>
struct DimensionalArrayExplicitRank; struct DimensionalArrayExplicitRank;
// Workaround for VC2017
#if defined(_MSC_VER) && _MSC_VER < 1920
template<std::size_t rank, std::size_t... sizes> template<std::size_t rank, std::size_t... sizes>
struct GetRankSize struct GetRankSize
{ {
@ -41,6 +44,22 @@ using GetArrayImplType =
std::array<std::conditional_t<rank == 1, T, DimensionalArrayExplicitRank<T, rank - 1, sizes...>>, std::array<std::conditional_t<rank == 1, T, DimensionalArrayExplicitRank<T, rank - 1, sizes...>>,
GetRankSize<rank, sizes...>::value>; GetRankSize<rank, sizes...>::value>;
#else
template<std::size_t rank, std::size_t... sizes>
constexpr std::size_t GetRankSize()
{
constexpr std::size_t size_array[] = {sizes...};
return size_array[rank - 1];
}
template<typename T, std::size_t rank, std::size_t... sizes>
using GetArrayImplType =
std::array<std::conditional_t<rank == 1, T, DimensionalArrayExplicitRank<T, rank - 1, sizes...>>,
GetRankSize<rank, sizes...>()>;
#endif
template<typename T, std::size_t rank_param, std::size_t... sizes> template<typename T, std::size_t rank_param, std::size_t... sizes>
struct DimensionalArrayExplicitRank : public GetArrayImplType<T, rank_param, sizes...> struct DimensionalArrayExplicitRank : public GetArrayImplType<T, rank_param, sizes...>
{ {