Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

particleadvection was missing ::template causing VS2015 failures

Browse Source
This commit is contained in:
Robert Maynard 2018-10-17 10:53:19 -04:00
parent bae6e5f4dd
commit 57236e0f6e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/worklet/particleadvection/Integrators.h
View File

@ -279,7 +279,8 @@ public:
using FieldEvaluateExecType =
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device()));
using Superclass =
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType, RK4Integrator::ExecObject<Device>>;
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType,
typename RK4Integrator::template ExecObject<Device>>;
public:
VTKM_EXEC_CONT
@ -360,14 +361,15 @@ public:
template <typename Device>
class ExecObject : public Integrator::ExecObjectBaseImpl<
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device())),
EulerIntegrator::ExecObject<Device>>
typename EulerIntegrator::template ExecObject<Device>>
{
VTKM_IS_DEVICE_ADAPTER_TAG(Device);
using FieldEvaluateExecType =
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device()));
using Superclass =
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType, EulerIntegrator::ExecObject<Device>>;
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType,
typename EulerIntegrator::template ExecObject<Device>>;
public:
VTKM_EXEC_CONT