Correct export in class declaration

- Update Analysis.h to have consistent export symbols
- Update Analysis.h -- try to fix MSVC linking errors
- Fixup exports
This commit is contained in:
Vicente Bolea 2023-07-26 12:34:58 -04:00 committed by Abhishek Yenpure
parent 6d1d4f90ae
commit 67716402bc
2 changed files with 8 additions and 8 deletions

@ -221,10 +221,10 @@ VTKM_CONT bool StreamlineAnalysis<ParticleType>::MakeDataSet(
return true;
}
template class VTKM_FILTER_FLOW_TEMPLATE_EXPORT NoAnalysis<vtkm::Particle>;
template class VTKM_FILTER_FLOW_TEMPLATE_EXPORT NoAnalysis<vtkm::ChargedParticle>;
template class VTKM_FILTER_FLOW_TEMPLATE_EXPORT StreamlineAnalysis<vtkm::Particle>;
template class VTKM_FILTER_FLOW_TEMPLATE_EXPORT StreamlineAnalysis<vtkm::ChargedParticle>;
template class VTKM_FILTER_FLOW_EXPORT NoAnalysis<vtkm::Particle>;
template class VTKM_FILTER_FLOW_EXPORT NoAnalysis<vtkm::ChargedParticle>;
template class VTKM_FILTER_FLOW_EXPORT StreamlineAnalysis<vtkm::Particle>;
template class VTKM_FILTER_FLOW_EXPORT StreamlineAnalysis<vtkm::ChargedParticle>;
} // namespace flow
} // namespace worklet

@ -28,7 +28,7 @@ namespace flow
{
template <typename ParticleType>
class VTKM_FILTER_FLOW_TEMPLATE_EXPORT NoAnalysisExec
class VTKM_FILTER_FLOW_EXPORT NoAnalysisExec
{
public:
VTKM_EXEC_CONT
@ -53,7 +53,7 @@ public:
};
template <typename ParticleType>
class VTKM_FILTER_FLOW_TEMPLATE_EXPORT NoAnalysis : public vtkm::cont::ExecutionObjectBase
class NoAnalysis : public vtkm::cont::ExecutionObjectBase
{
public:
// Intended to store advected particles after Finalize
@ -97,7 +97,7 @@ public:
};
template <typename ParticleType>
class VTKM_FILTER_FLOW_TEMPLATE_EXPORT StreamlineAnalysisExec
class VTKM_FILTER_FLOW_EXPORT StreamlineAnalysisExec
{
public:
VTKM_EXEC_CONT
@ -163,7 +163,7 @@ private:
};
template <typename ParticleType>
class VTKM_FILTER_FLOW_TEMPLATE_EXPORT StreamlineAnalysis : public vtkm::cont::ExecutionObjectBase
class StreamlineAnalysis : public vtkm::cont::ExecutionObjectBase
{
public:
// Intended to store advected particles after Finalize