Merge topic 'leverage_decltype_more_often'

dfadaabf VTK-m Transport doesn't rely on 'ExecutionTypes' typedefs.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1272

vtkm/cont/arg/TransportTagArrayIn.h

@@ -47,7 +47,7 @@ struct Transport<vtkm::cont::arg::TransportTagArrayIn, ContObjectType, Device>
 {
   VTKM_IS_ARRAY_HANDLE(ContObjectType);
 
-  using ExecObjectType = typename ContObjectType::template ExecutionTypes<Device>::PortalConst;
+  using ExecObjectType = decltype(std::declval<ContObjectType>().PrepareForInput(Device()));
 
   template <typename InputDomainType>
   VTKM_CONT ExecObjectType operator()(const ContObjectType& object,

vtkm/cont/arg/TransportTagArrayInOut.h

@@ -50,7 +50,7 @@ struct Transport<vtkm::cont::arg::TransportTagArrayInOut, ContObjectType, Device
   // is not an array handle as an argument that is expected to be one.
   VTKM_IS_ARRAY_HANDLE(ContObjectType);
 
-  using ExecObjectType = typename ContObjectType::template ExecutionTypes<Device>::Portal;
+  using ExecObjectType = decltype(std::declval<ContObjectType>().PrepareForInPlace(Device()));
 
   template <typename InputDomainType>
   VTKM_CONT ExecObjectType operator()(ContObjectType object,

vtkm/cont/arg/TransportTagArrayOut.h

@@ -49,7 +49,8 @@ struct Transport<vtkm::cont::arg::TransportTagArrayOut, ContObjectType, Device>
   // is not an array handle as an argument that is expected to be one.
   VTKM_IS_ARRAY_HANDLE(ContObjectType);
 
-  using ExecObjectType = typename ContObjectType::template ExecutionTypes<Device>::Portal;
+  using ExecObjectType =
+    decltype(std::declval<ContObjectType>().PrepareForOutput(vtkm::Id{}, Device()));
 
   template <typename InputDomainType>
   VTKM_CONT ExecObjectType operator()(ContObjectType object,

vtkm/cont/arg/TransportTagCellSetIn.h

@@ -50,10 +50,8 @@ struct Transport<vtkm::cont::arg::TransportTagCellSetIn<FromTopology, ToTopology
 {
   VTKM_IS_CELL_SET(ContObjectType);
 
-  using ExecObjectType =
-    typename ContObjectType::template ExecutionTypes<Device,
-                                                     FromTopology,
-                                                     ToTopology>::ExecObjectType;
+  using ExecObjectType = decltype(
+    std::declval<ContObjectType>().PrepareForInput(Device(), FromTopology(), ToTopology()));
 
   template <typename InputDomainType>
   VTKM_CONT ExecObjectType

vtkm/cont/arg/TransportTagTopologyFieldIn.h

@@ -87,7 +87,8 @@ struct Transport<vtkm::cont::arg::TransportTagTopologyFieldIn<TopologyElementTag
 {
   VTKM_IS_ARRAY_HANDLE(ContObjectType);
 
-  using ExecObjectType = typename ContObjectType::template ExecutionTypes<Device>::PortalConst;
+
+  using ExecObjectType = decltype(std::declval<ContObjectType>().PrepareForInput(Device()));
 
   VTKM_CONT
   ExecObjectType operator()(const ContObjectType& object,