1 files changed, 5 insertions, 3 deletions
diff --git a/starmath/qa/cppunit/mock-visitor.hxx b/starmath/qa/cppunit/mock-visitor.hxx
index 5c7c7af08884..2c7f6bf77efc 100644
--- a/starmath/qa/cppunit/mock-visitor.hxx
+++ b/starmath/qa/cppunit/mock-visitor.hxx
@@ -190,9 +190,11 @@ public:
 private:
     /** Auxiliary method for visiting the children of a pNode */
     void VisitChildren( SmStructureNode* pNode ) {
-        SmNodeIterator it( pNode );
-        while( it.Next() )
-            it->Accept( this );
+        for (auto pChild : *pNode)
+        {
+            if (pChild)
+                pChild->Accept(this);
+        }
     }
 };