From 99cbbf2ff241584496cb2291249327d0cc69d9f9 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Thu, 19 Sep 2019 12:30:59 -0400
Subject: [PATCH] Correct a regression in ArrayHandleDecorator with
 VisualStudio 2017

---
 vtkm/VecTraits.h                 | 8 ++++----
 vtkm/cont/ArrayHandleDecorator.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vtkm/VecTraits.h b/vtkm/VecTraits.h
index 12e9000dc..57f34ed8d 100644
--- a/vtkm/VecTraits.h
+++ b/vtkm/VecTraits.h
@@ -275,11 +275,11 @@ struct VTKM_NEVER_EXPORT VecTraits<vtkm::Vec<T, Size>>
 /// is vtkm::Vec<T2, N>.
 ///@{
 #if defined(VTKM_GCC) && (__GNUC__ <= 5)
-  // Silly workaround for bug in GCC <= 6
+  // Silly workaround for bug in GCC <= 5
   template <typename NewComponentType>
   using ReplaceComponentType =
     typename detail::VecReplaceComponentTypeGCC4or5<NewComponentType, Size>::type;
-#else // !GCC <= 6
+#else // !GCC <= 5
   template <typename NewComponentType>
   using ReplaceComponentType = vtkm::Vec<NewComponentType, Size>;
 #endif
@@ -292,11 +292,11 @@ struct VTKM_NEVER_EXPORT VecTraits<vtkm::Vec<T, Size>>
 /// VecTraits<Vec<Vec<T, M>, N>::ReplaceComponentType<T2> is Vec<Vec<T2, M>, N>.
 ///@{
 #if defined(VTKM_GCC) && (__GNUC__ <= 5)
-  // Silly workaround for bug in GCC <= 6
+  // Silly workaround for bug in GCC <= 5
   template <typename NewComponentType>
   using ReplaceBaseComponentType =
     typename detail::VecReplaceBaseComponentTypeGCC4or5<T, Size, NewComponentType>::type;
-#else // !GCC <= 6
+#else // !GCC <= 5
   template <typename NewComponentType>
   using ReplaceBaseComponentType = vtkm::Vec<
     typename vtkm::VecTraits<ComponentType>::template ReplaceBaseComponentType<NewComponentType>,
diff --git a/vtkm/cont/ArrayHandleDecorator.h b/vtkm/cont/ArrayHandleDecorator.h
index 14a53ae61..825e54b70 100644
--- a/vtkm/cont/ArrayHandleDecorator.h
+++ b/vtkm/cont/ArrayHandleDecorator.h
@@ -352,7 +352,7 @@ struct DecoratorStorageTraits
   using ArrayTupleType = vtkmstd::tuple<ArrayTs...>;
 
 // size_t integral constants that index ArrayTs:
-#if defined(VTKM_MSVC) && (_MSC_VER == 1900)
+#if defined(VTKM_MSVC) && (_MSC_VER < 1920) //Less than MSCV2019
   using IndexList = brigand::make_sequence<brigand::size_t<0>, sizeof...(ArrayTs)>;
 #else
   using IndexList = tao::seq::make_index_sequence<sizeof...(ArrayTs)>;
@@ -435,7 +435,7 @@ struct DecoratorStorageTraits
     return { impl.CreateFunctor(portals...), impl.CreateInverseFunctor(portals...), numVals };
   }
 
-#if defined(VTKM_MSVC) && (_MSC_VER == 1900)
+#if defined(VTKM_MSVC) && (_MSC_VER < 1920) //Less than MSCV2019
   // Portal construction methods. These actually create portals.
   template <template <typename...> class List, typename... Indices>
   VTKM_CONT static PortalControlType MakePortalControl(const DecoratorImplT& impl,