Merge topic 'fix-includes'

758a6092 vtkDataAssembly: fix variable shadow warning
b69dcc7e vtkDataAssembly: add missing include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen <cory.quammen@kitware.com>
Merge-request: !6883

Common/DataModel/vtkDataAssembly.cxx

@@ -656,11 +656,11 @@ bool vtkDataAssembly::RemoveAllDataSetIndices(int id, bool traverse_subtree /*=t
   struct Walker : pugi::xml_tree_walker
   {
     std::vector<pugi::xml_node>* ToRemove = nullptr;
-    bool for_each(pugi::xml_node& node) override
+    bool for_each(pugi::xml_node& nnode) override
     {
-      if (strcmp(node.name(), "dataset") == 0)
+      if (strcmp(nnode.name(), "dataset") == 0)
       {
-        this->ToRemove->push_back(node);
+        this->ToRemove->push_back(nnode);
       }
       return true;
     }

Common/DataModel/vtkDataAssembly.h

@@ -121,6 +121,7 @@
 
 #include <map>    // for std::map
 #include <memory> // for std::unique_ptr
+#include <string> // for std::string
 #include <vector> // for std::vector
 
 class vtkDataAssemblyVisitor;