Commit c9b41f8a authored by David C. Lonie's avatar David C. Lonie

Restore vtkAOSDataArrayTemplate deprecated API for compat.

parent 133816b7
......@@ -178,6 +178,14 @@ public:
virtual bool HasStandardMemoryLayout() { return true; }
virtual void ShallowCopy(vtkDataArray *other);
// Description:
// @deprecated Replace TupleValue with TypedTuple to use the new method
// names. Note that the new signatures are also const-correct.
VTK_LEGACY(void GetTupleValue(vtkIdType tupleIdx, ValueType *tuple));
VTK_LEGACY(void SetTupleValue(vtkIdType tupleIdx, const ValueType *tuple));
VTK_LEGACY(void InsertTupleValue(vtkIdType tupleIdx, const ValueType *tuple));
VTK_LEGACY(vtkIdType InsertNextTupleValue(const ValueType *tuple));
//BTX
protected:
vtkAOSDataArrayTemplate();
......
......@@ -158,6 +158,52 @@ void* vtkAOSDataArrayTemplate<ValueTypeT>::GetVoidPointer(vtkIdType valueIdx)
return this->GetPointer(valueIdx);
}
// Deprecated API:
#ifndef VTK_LEGACY_REMOVE
//------------------------------------------------------------------------------
template <typename ValueTypeT>
void vtkAOSDataArrayTemplate<ValueTypeT>::GetTupleValue(vtkIdType tupleIdx,
ValueType *tuple)
{
VTK_LEGACY_REPLACED_BODY(vtkAOSDataArrayTemplate::GetTupleValue, "VTK 7.1",
vtkGenericDataArray::GetTypedTuple);
this->GetTypedTuple(tupleIdx, tuple);
}
//------------------------------------------------------------------------------
template <typename ValueTypeT>
void vtkAOSDataArrayTemplate<ValueTypeT>::SetTupleValue(vtkIdType tupleIdx,
const ValueType *tuple)
{
VTK_LEGACY_REPLACED_BODY(vtkAOSDataArrayTemplate::SetTupleValue, "VTK 7.1",
vtkGenericDataArray::SetTypedTuple);
this->SetTypedTuple(tupleIdx, tuple);
}
//------------------------------------------------------------------------------
template <typename ValueTypeT>
void vtkAOSDataArrayTemplate<ValueTypeT>::
InsertTupleValue(vtkIdType tupleIdx, const ValueType *tuple)
{
VTK_LEGACY_REPLACED_BODY(vtkAOSDataArrayTemplate::InsertTupleValue, "VTK 7.1",
vtkGenericDataArray::InsertTypedTuple);
this->InsertTypedTuple(tupleIdx, tuple);
}
//------------------------------------------------------------------------------
template <typename ValueTypeT>
vtkIdType vtkAOSDataArrayTemplate<ValueTypeT>::
InsertNextTupleValue(const ValueType *tuple)
{
VTK_LEGACY_REPLACED_BODY(vtkAOSDataArrayTemplate::InsertNextTupleValue,
"VTK 7.1",
vtkGenericDataArray::InsertNextTypedTuple);
return this->InsertNextTypedTuple(tuple);
}
#endif // VTK_LEGACY_REMOVE
//-----------------------------------------------------------------------------
template <class ValueTypeT>
bool vtkAOSDataArrayTemplate<ValueTypeT>::AllocateTuples(vtkIdType numTuples)
......
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