Merge topic 'msvc-2013-compat'

75590f1f MSVC2013 lacks support for function type aliases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !858
This commit is contained in:
Allison Vacanti 2017-08-02 16:19:20 +00:00 committed by Kitware Robot
commit c077f16fb9

@ -36,13 +36,13 @@ struct TestWholeCellSetIn
template <typename FromTopology, typename ToTopology>
struct WholeCellSetWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> indices,
typedef void ControlSignature(FieldIn<> indices,
WholeCellSetIn<FromTopology, ToTopology>,
FieldOut<> numberOfElements,
FieldOut<> shapes,
FieldOut<> numberOfindices,
FieldOut<> connectionSum);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6);
using InputDomain = _1;
template <typename ConnectivityType>