Commit 57236e0f authored by Robert Maynard's avatar Robert Maynard
Browse files

particleadvection was missing ::template causing VS2015 failures

parent bae6e5f4
...@@ -279,7 +279,8 @@ public: ...@@ -279,7 +279,8 @@ public:
using FieldEvaluateExecType = using FieldEvaluateExecType =
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device())); decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device()));
using Superclass = using Superclass =
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType, RK4Integrator::ExecObject<Device>>; Integrator::ExecObjectBaseImpl<FieldEvaluateExecType,
typename RK4Integrator::template ExecObject<Device>>;
public: public:
VTKM_EXEC_CONT VTKM_EXEC_CONT
...@@ -360,14 +361,15 @@ public: ...@@ -360,14 +361,15 @@ public:
template <typename Device> template <typename Device>
class ExecObject : public Integrator::ExecObjectBaseImpl< class ExecObject : public Integrator::ExecObjectBaseImpl<
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device())), decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device())),
EulerIntegrator::ExecObject<Device>> typename EulerIntegrator::template ExecObject<Device>>
{ {
VTKM_IS_DEVICE_ADAPTER_TAG(Device); VTKM_IS_DEVICE_ADAPTER_TAG(Device);
using FieldEvaluateExecType = using FieldEvaluateExecType =
decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device())); decltype(std::declval<FieldEvaluateType>().PrepareForExecution(Device()));
using Superclass = using Superclass =
Integrator::ExecObjectBaseImpl<FieldEvaluateExecType, EulerIntegrator::ExecObject<Device>>; Integrator::ExecObjectBaseImpl<FieldEvaluateExecType,
typename EulerIntegrator::template ExecObject<Device>>;
public: public:
VTKM_EXEC_CONT VTKM_EXEC_CONT
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment