Fix ArrayHandleView compile error caused by merge error
Recent merge requests !2354 and !2356 both edited ArrayHandleView. Git successfully merged the changes, but the changes were still incompatible with each other, causing an unexpected compile error on master. This fixes the issue.
This commit is contained in:
parent
39715c92da
commit
16471fcaff
@ -182,6 +182,16 @@ public:
|
||||
return vtkm::cont::internal::CreateBuffers(vtkm::internal::ViewIndices(startIndex, numValues),
|
||||
array);
|
||||
}
|
||||
|
||||
VTKM_CONT static ArrayHandleType GetSourceArray(const vtkm::cont::internal::Buffer* buffers)
|
||||
{
|
||||
return ArrayHandleType(buffers + 1);
|
||||
}
|
||||
|
||||
VTKM_CONT static vtkm::Id GetStartIndex(const vtkm::cont::internal::Buffer* buffers)
|
||||
{
|
||||
return buffers[0].GetMetaData<vtkm::internal::ViewIndices>().StartIndex;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace internal
|
||||
@ -214,9 +224,15 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
VTKM_CONT ArrayHandleType GetSourceArray() const { return this->GetStorage().GetArray(); }
|
||||
VTKM_CONT ArrayHandleType GetSourceArray() const
|
||||
{
|
||||
return this->GetStorage().GetSourceArray(this->GetBuffers());
|
||||
}
|
||||
|
||||
VTKM_CONT vtkm::Id GetStartIndex() const { return this->GetStorage().GetStartIndex(); }
|
||||
VTKM_CONT vtkm::Id GetStartIndex() const
|
||||
{
|
||||
return this->GetStorage().GetStartIndex(this->GetBuffers());
|
||||
}
|
||||
};
|
||||
|
||||
template <typename ArrayHandleType>
|
||||
|
Loading…
Reference in New Issue
Block a user