Commit c0a5e162 authored by Robert Maynard's avatar Robert Maynard

Fix vtk-m warnings on static osx builds.

parent bc977202
This diff is collapsed.
......@@ -34,7 +34,7 @@ namespace cont
/// uniform orthogonal grid (extent, origin, and spacing) and implicitly
/// computes these coordinates in its array portal.
///
class ArrayHandleUniformPointCoordinates
class VTKM_ALWAYS_EXPORT ArrayHandleUniformPointCoordinates
: public vtkm::cont::ArrayHandle<
vtkm::Vec<vtkm::FloatDefault, 3>,
vtkm::cont::StorageTagImplicit<vtkm::internal::ArrayPortalUniformPointCoordinates>>
......
......@@ -343,7 +343,7 @@ struct VTKM_ALWAYS_EXPORT StorageTagVirtualCoordinates
};
template <>
class Storage<vtkm::Vec<vtkm::FloatDefault, 3>, StorageTagVirtualCoordinates>
class VTKM_ALWAYS_EXPORT Storage<vtkm::Vec<vtkm::FloatDefault, 3>, StorageTagVirtualCoordinates>
{
public:
using ValueType = vtkm::Vec<vtkm::FloatDefault, 3>;
......@@ -378,7 +378,8 @@ private:
//=============================================================================
template <typename DeviceAdapter>
class ArrayTransfer<vtkm::Vec<vtkm::FloatDefault, 3>, StorageTagVirtualCoordinates, DeviceAdapter>
class VTKM_ALWAYS_EXPORT
ArrayTransfer<vtkm::Vec<vtkm::FloatDefault, 3>, StorageTagVirtualCoordinates, DeviceAdapter>
{
public:
using ValueType = vtkm::Vec<vtkm::FloatDefault, 3>;
......
......@@ -36,7 +36,8 @@ namespace internal
{
template <typename WType>
void TaskTilingSetErrorBuffer(void* w, const vtkm::exec::internal::ErrorMessageBuffer& buffer)
void VTKM_NEVER_EXPORT
TaskTilingSetErrorBuffer(void* w, const vtkm::exec::internal::ErrorMessageBuffer& buffer)
{
using WorkletType = typename std::remove_cv<WType>::type;
WorkletType* const worklet = static_cast<WorkletType*>(w);
......@@ -44,11 +45,11 @@ void TaskTilingSetErrorBuffer(void* w, const vtkm::exec::internal::ErrorMessageB
}
template <typename WType, typename IType>
void TaskTiling1DExecute(void* w,
void* const v,
vtkm::Id globalIndexOffset,
vtkm::Id start,
vtkm::Id end)
void VTKM_NEVER_EXPORT TaskTiling1DExecute(void* w,
void* const v,
vtkm::Id globalIndexOffset,
vtkm::Id start,
vtkm::Id end)
{
using WorkletType = typename std::remove_cv<WType>::type;
using InvocationType = typename std::remove_cv<IType>::type;
......@@ -71,7 +72,8 @@ void TaskTiling1DExecute(void* w,
}
template <typename FType>
void FunctorTiling1DExecute(void* f, void* const, vtkm::Id, vtkm::Id start, vtkm::Id end)
void VTKM_NEVER_EXPORT
FunctorTiling1DExecute(void* f, void* const, vtkm::Id, vtkm::Id start, vtkm::Id end)
{
using FunctorType = typename std::remove_cv<FType>::type;
FunctorType const* const functor = static_cast<FunctorType*>(f);
......@@ -83,13 +85,13 @@ void FunctorTiling1DExecute(void* f, void* const, vtkm::Id, vtkm::Id start, vtkm
}
template <typename WType, typename IType>
void TaskTiling3DExecute(void* w,
void* const v,
vtkm::Id globalIndexOffset,
vtkm::Id istart,
vtkm::Id iend,
vtkm::Id j,
vtkm::Id k)
void VTKM_NEVER_EXPORT TaskTiling3DExecute(void* w,
void* const v,
vtkm::Id globalIndexOffset,
vtkm::Id istart,
vtkm::Id iend,
vtkm::Id j,
vtkm::Id k)
{
using WorkletType = typename std::remove_cv<WType>::type;
using InvocationType = typename std::remove_cv<IType>::type;
......@@ -114,13 +116,13 @@ void TaskTiling3DExecute(void* w,
}
template <typename FType>
void FunctorTiling3DExecute(void* f,
void* const,
vtkm::Id,
vtkm::Id istart,
vtkm::Id iend,
vtkm::Id j,
vtkm::Id k)
void VTKM_NEVER_EXPORT FunctorTiling3DExecute(void* f,
void* const,
vtkm::Id,
vtkm::Id istart,
vtkm::Id iend,
vtkm::Id j,
vtkm::Id k)
{
using FunctorType = typename std::remove_cv<FType>::type;
FunctorType const* const functor = static_cast<FunctorType*>(f);
......
Markdown is supported
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