From d53abf5bf1a9481e8a395f033fab144df11ec3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Mon, 2 Jul 2018 17:34:31 +0200 Subject: [PATCH] [poincare] Remove warning on unused variable --- poincare/include/poincare/tree_pool.h | 6 ++++-- poincare/src/tree_node.cpp | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/poincare/include/poincare/tree_pool.h b/poincare/include/poincare/tree_pool.h index 83d4cd987..e88ed52a4 100644 --- a/poincare/include/poincare/tree_pool.h +++ b/poincare/include/poincare/tree_pool.h @@ -65,9 +65,11 @@ public: int numberOfNodes() const { int count = 0; - AllPool nodes = const_cast(this)->allNodes(); - for (TreeNode * t : nodes) { + TreeNode * firstNode = first(); + TreeNode * lastNode = last(); + while (firstNode != lastNode) { count++; + firstNode = firstNode->next(); } return count; } diff --git a/poincare/src/tree_node.cpp b/poincare/src/tree_node.cpp index 7e59cdbad..56c863bb3 100644 --- a/poincare/src/tree_node.cpp +++ b/poincare/src/tree_node.cpp @@ -93,8 +93,11 @@ TreeNode * TreeNode::editableRootTree() { int TreeNode::numberOfDescendants(bool includeSelf) const { int result = includeSelf ? 1 : 0; - for (TreeNode * child : depthFirstChildren()) { + TreeNode * nextSiblingNode = nextSibling(); + TreeNode * currentNode = next(); + while (currentNode != nextSiblingNode) { result++; + currentNode = currentNode->next(); } return result; }