Add InputDomainTag to Invocation

This commit is contained in:
Kenneth Moreland 2017-03-03 20:12:20 -07:00
parent f1bc19f4a2
commit 297c1b0709
2 changed files with 13 additions and 8 deletions

@ -137,8 +137,8 @@ struct FetchArrayTopologyMapInTests
BaseFunctionInterface()
.Replace<InputDomainIndex>(connectivity)
.template Replace<ParamIndex>(TestPortal<T>()),
vtkm::internal::NullType(),
vtkm::internal::NullType(),
BaseFunctionInterface(),
BaseFunctionInterface(),
TestIndexPortal(),
TestZeroPortal()));
}
@ -218,8 +218,8 @@ void TryStructuredPointCoordinates(
BaseFunctionInterface()
.Replace<1>(connectivity)
.template Replace<2>(coordinates),
vtkm::internal::NullType(),
vtkm::internal::NullType(),
BaseFunctionInterface(),
BaseFunctionInterface(),
TestIndexPortal(),
TestZeroPortal())
);
@ -229,8 +229,8 @@ void TryStructuredPointCoordinates(
BaseFunctionInterface()
.Replace<3>(connectivity)
.template Replace<1>(coordinates),
vtkm::internal::NullType(),
vtkm::internal::NullType(),
BaseFunctionInterface(),
BaseFunctionInterface(),
TestIndexPortal(),
TestZeroPortal())
);

@ -237,8 +237,13 @@ struct Invocation
/// A convenience typedef for the input domain type.
///
typedef typename ParameterInterface::
template ParameterType<InputDomainIndex>::type InputDomainType;
using InputDomainType =
typename ParameterInterface::template ParameterType<InputDomainIndex>::type;
/// A convenience typedef for the control signature tag of the input domain.
///
using InputDomainTag =
typename ControlInterface::template ParameterType<InputDomainIndex>::type;
/// A convenience method to get the input domain object.
///