From a68bbb3e853ee64145878a9234db061ca61ccbb9 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Wed, 8 Jul 2020 15:00:27 +1000
Subject: [PATCH] Common/DimensionalArray: Work around VC2017 issue

---
 src/common/dimensional_array.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/common/dimensional_array.h b/src/common/dimensional_array.h
index 459cd705b..b4b6a4a43 100644
--- a/src/common/dimensional_array.h
+++ b/src/common/dimensional_array.h
@@ -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...>;
-