Fix for MSVC compile isses
MSVC does not allow typename for non templated types while compiling with c++98 std. (clang/gcc allow it) Don't know about which standards Kitware uses to test builds, but this should fix it. Also removing unused parameter from the particle advection example.
This commit is contained in:
parent
50dbd6347a
commit
5a652f41bc
@ -62,7 +62,6 @@ void RunTest(const std::string& fname,
|
||||
vtkm::Id advectType,
|
||||
vtkm::Id stepsPerRound,
|
||||
vtkm::Id particlesPerRound,
|
||||
bool dumpOutput,
|
||||
vtkm::Id seeding)
|
||||
{
|
||||
typedef VTKM_DEFAULT_DEVICE_ADAPTER_TAG DeviceAdapter;
|
||||
@ -328,7 +327,6 @@ int main(int argc, char** argv)
|
||||
advectType,
|
||||
stepsPerRound,
|
||||
particlesPerRound,
|
||||
dumpOutput,
|
||||
seeding);
|
||||
return 0;
|
||||
}
|
||||
|
@ -104,8 +104,7 @@ void TestParticleAdvection()
|
||||
typedef VTKM_DEFAULT_DEVICE_ADAPTER_TAG DeviceAdapter;
|
||||
typedef vtkm::Float32 FieldType;
|
||||
typedef vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> FieldHandle;
|
||||
typedef
|
||||
typename FieldHandle::template ExecutionTypes<DeviceAdapter>::PortalConst FieldPortalConstType;
|
||||
typedef FieldHandle::template ExecutionTypes<DeviceAdapter>::PortalConst FieldPortalConstType;
|
||||
|
||||
std::cout << "Testing Integrators for ParticleAdvection Worklet" << std::endl;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user