#include "vtkUnsignedCharArray.h"
#include "vtkDataSetAttributes.h"
#include "vtkDemandDrivenPipeline.h"
-#include "vtkCompositeDataIterator.h"
+//#include "vtkCompositeDataIterator.h"
+#include "vtkDataObjectTreeIterator.h"
-#include <vtkstd/map>
-#include <vtkstd/deque>
+#include <map>
+#include <deque>
+//#include <vtkstd/map>
+//#include <vtkstd/deque>
-vtkCxxRevisionMacro(vtkExtractGroup, "$Revision$");
+// vtkCxxRevisionMacro(vtkExtractGroup, "$Revision$");
vtkStandardNewMacro(vtkExtractGroup);
vtkCxxSetObjectMacro(vtkExtractGroup, SIL, vtkMutableDirectedGraph);
crossEdgesArray->SetName("CrossEdges");
sil->GetEdgeData()->AddArray(crossEdgesArray);
crossEdgesArray->Delete();
- vtkstd::deque<vtkstd::string> names;
+ std::deque<std::string> names;
// Now build the hierarchy.
vtkIdType rootId=sil->AddVertex();
namesArray->SetNumberOfTuples(sil->GetNumberOfVertices());
sil->GetVertexData()->AddArray(namesArray);
namesArray->Delete();
- vtkstd::deque<vtkstd::string>::iterator iter;
+ std::deque<std::string>::iterator iter;
vtkIdType cc;
for(cc=0, iter=names.begin(); iter!=names.end(); ++iter, ++cc)
{
outmb->CopyStructure(inmb);
- vtkCompositeDataIterator* iterator = inmb->NewIterator();
+ //vtkCompositeDataIterator* iterator = inmb->NewIterator();
+ vtkDataObjectTreeIterator* iterator = vtkDataObjectTreeIterator::SafeDownCast( inmb->NewIterator() );
iterator->SetVisitOnlyLeaves(true);
iterator->InitTraversal();
while(!iterator->IsDoneWithTraversal())