From 803b68b2795299870da9858f6651e8e04b9a43b7 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Tue, 25 May 2021 19:00:40 +0200
Subject: [PATCH] Common/DimensionalArray: Re-revert the workaround

VS16.10 fixes the regression and bumps up _MSC_VER,
so make only VS2017 and VS16.9 use the workaround
---
 src/common/dimensional_array.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/dimensional_array.h b/src/common/dimensional_array.h
index a85965f2d..46d5d0032 100644
--- a/src/common/dimensional_array.h
+++ b/src/common/dimensional_array.h
@@ -29,8 +29,8 @@ namespace detail {
 template<typename T, std::size_t rank, std::size_t... sizes>
 struct DimensionalArrayExplicitRank;
 
-// Workaround for MSVC
-#if defined(_MSC_VER)
+// Workaround for VS2017 & VS 16.9.x
+#if defined(_MSC_VER) && (_MSC_VER < 1920 || _MSC_VER == 1928)
 
 template<std::size_t rank, std::size_t... sizes>
 struct GetRankSize