ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Common/DimensionalArray: Work around VC2017 issue

This commit is contained in:
Connor McLaughlin 2020-07-08 15:00:27 +10:00
parent 068b244303
commit a68bbb3e85
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/dimensional_array.h
View File

@ -30,16 +30,16 @@ template<typename T, std::size_t rank, std::size_t... sizes>
struct DimensionalArrayExplicitRank;
template<std::size_t rank, std::size_t... sizes>
constexpr std::size_t GetRankSize()
struct GetRankSize
{
constexpr std::size_t size_array[] = {sizes...};
return size_array[rank - 1];
}
static constexpr std::size_t size_array[] = {sizes...};
static constexpr std::size_t value = 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...>()>;
GetRankSize<rank, sizes...>::value>;
template<typename T, std::size_t rank_param, std::size_t... sizes>
struct DimensionalArrayExplicitRank : public GetArrayImplType<T, rank_param, sizes...>
@ -77,4 +77,3 @@ struct DimensionalArrayExplicitRank : public GetArrayImplType<T, rank_param, siz
template<typename T, std::size_t... sizes>
using DimensionalArray = detail::DimensionalArrayExplicitRank<T, sizeof...(sizes), sizes...>;