Merge topic 'correct_msvc_2015_failure'

f89672b71 UnitTestFetchArrayTopologyMapIn now compiles with VS2015

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1921
This commit is contained in:
Robert Maynard 2019-12-08 17:42:26 +00:00 committed by Kitware Robot
commit 4f8a97b998

@ -63,12 +63,7 @@ struct replace
template <typename T, vtkm::IdComponent Index>
struct ReturnType
{
using type = T;
};
template <typename T>
struct ReturnType<T, IndexToReplace>
{
using type = U;
using type = typename std::conditional<Index == IndexToReplace, U, T>::type;
};
template <typename T, vtkm::IdComponent Index>