diff --git a/poincare/include/poincare/complex.h b/poincare/include/poincare/complex.h index e03d9caac..9f36faf88 100644 --- a/poincare/include/poincare/complex.h +++ b/poincare/include/poincare/complex.h @@ -55,7 +55,7 @@ public: T real() { return node()->real(); } T imag() { return node()->imag(); } private: - ComplexNode * node() const override { return static_cast *>(Evaluation::node()); } + ComplexNode * node() const { return static_cast *>(Evaluation::node()); } }; diff --git a/poincare/include/poincare/decimal.h b/poincare/include/poincare/decimal.h index de42223cc..09ff2e98c 100644 --- a/poincare/include/poincare/decimal.h +++ b/poincare/include/poincare/decimal.h @@ -100,7 +100,7 @@ public: constexpr static int k_maxExponent = 1000; private: constexpr static int k_maxMantissaLength = 20; - DecimalNode * node() const override { return static_cast(Number::node()); } + DecimalNode * node() const { return static_cast(Number::node()); } Decimal(size_t size, const Integer & m, int e); Expression setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const; // Simplification diff --git a/poincare/include/poincare/empty_layout_node.h b/poincare/include/poincare/empty_layout_node.h index b07154454..4df6a4dd7 100644 --- a/poincare/include/poincare/empty_layout_node.h +++ b/poincare/include/poincare/empty_layout_node.h @@ -94,7 +94,7 @@ public: node()->setColor(color); } private: - virtual EmptyLayoutNode * node() const override { return static_cast(LayoutReference::node()); } + EmptyLayoutNode * node() const { return static_cast(LayoutReference::node()); } }; } diff --git a/poincare/include/poincare/evaluation.h b/poincare/include/poincare/evaluation.h index a4e573119..6709462a7 100644 --- a/poincare/include/poincare/evaluation.h +++ b/poincare/include/poincare/evaluation.h @@ -47,7 +47,7 @@ public: // Does not work :static_assert(sizeof(U) == sizeof(Evaluation), "Size mismatch"); return *reinterpret_cast(const_cast *>(this)); } - EvaluationNode * node() const override { + EvaluationNode * node() const { assert(TreeByValue::node() == nullptr || !TreeByValue::node()->isGhost()); return static_cast *>(TreeByValue::node()); } diff --git a/poincare/include/poincare/expression.h b/poincare/include/poincare/expression.h index 6e2bd8f7a..dcef4a97e 100644 --- a/poincare/include/poincare/expression.h +++ b/poincare/include/poincare/expression.h @@ -71,7 +71,7 @@ public: Expression replaceSymbolWithExpression(char symbol, Expression expression) const { return node()->replaceSymbolWithExpression(symbol, expression); } /* Reference */ - ExpressionNode * node() const override { + ExpressionNode * node() const { assert(TreeByValue::node() == nullptr || !TreeByValue::node()->isGhost()); return static_cast(TreeByValue::node()); } diff --git a/poincare/include/poincare/float.h b/poincare/include/poincare/float.h index 73223064d..66e5b4399 100644 --- a/poincare/include/poincare/float.h +++ b/poincare/include/poincare/float.h @@ -72,7 +72,7 @@ public: node()->setFloat(value); } private: - FloatNode * node() const override { return static_cast *>(Number::node()); } + FloatNode * node() const { return static_cast *>(Number::node()); } }; } diff --git a/poincare/include/poincare/grid_layout_node.h b/poincare/include/poincare/grid_layout_node.h index 89a6c922a..dfb03d34c 100644 --- a/poincare/include/poincare/grid_layout_node.h +++ b/poincare/include/poincare/grid_layout_node.h @@ -96,7 +96,7 @@ public: LayoutReference::addChildAtIndex(l, index, currentNumberOfChildren, cursor); } private: - virtual GridLayoutNode * node() const override { return static_cast(LayoutReference::node()); } + virtual GridLayoutNode * node() const { return static_cast(LayoutReference::node()); } void setNumberOfRows(int rows) { assert(rows >= 0); node()->setNumberOfRows(rows); diff --git a/poincare/include/poincare/infinity.h b/poincare/include/poincare/infinity.h index eee6f5d92..3a8ffbf3f 100644 --- a/poincare/include/poincare/infinity.h +++ b/poincare/include/poincare/infinity.h @@ -52,7 +52,7 @@ public: node()->setNegative(negative); } private: - InfinityNode * node() const override { return static_cast(Number::node()); } + InfinityNode * node() const { return static_cast(Number::node()); } }; } diff --git a/poincare/include/poincare/integer.h b/poincare/include/poincare/integer.h index 24ab5fb56..5c9fc79f7 100644 --- a/poincare/include/poincare/integer.h +++ b/poincare/include/poincare/integer.h @@ -230,7 +230,7 @@ public: static Integer Factorial(const Integer & i); private: // TreeNode - IntegerNode * node() const override { return static_cast(Number::node()); } + IntegerNode * node() const { return static_cast(Number::node()); } Integer(const native_uint_t * digits, size_t numberOfDigits, bool negative, bool enableOverflow = false); Integer(size_t size, const native_uint_t * digits, size_t numberOfDigits, bool negative); diff --git a/poincare/include/poincare/layout_reference.h b/poincare/include/poincare/layout_reference.h index 4e47b5a02..00806c030 100644 --- a/poincare/include/poincare/layout_reference.h +++ b/poincare/include/poincare/layout_reference.h @@ -30,7 +30,7 @@ public: return cast; } - LayoutNode * node() const override { + LayoutNode * node() const { assert(!TreeByReference::node()->isGhost()); return static_cast(TreeByReference::node()); } diff --git a/poincare/include/poincare/matrix.h b/poincare/include/poincare/matrix.h index 955431f51..9033dfcc6 100644 --- a/poincare/include/poincare/matrix.h +++ b/poincare/include/poincare/matrix.h @@ -101,7 +101,7 @@ private: // TODO: find another solution for inverse and determinant (avoid capping the matrix) static constexpr int k_maxNumberOfCoefficients = 100; - MatrixNode * node() const override { return static_cast(Expression::node()); } + MatrixNode * node() const { return static_cast(Expression::node()); } void setNumberOfRows(int rows) { assert(rows >= 0); node()->setNumberOfRows(rows); } void setNumberOfColumns(int columns) { assert(columns >= 0); node()->setNumberOfColumns(columns); } /* rowCanonize turns a matrix in its reduced row echelon form. */ diff --git a/poincare/include/poincare/number.h b/poincare/include/poincare/number.h index b2373cd65..cf72e2566 100644 --- a/poincare/include/poincare/number.h +++ b/poincare/include/poincare/number.h @@ -47,7 +47,7 @@ public: Number setSign(ExpressionNode::Sign s, Context & context, Preferences::AngleUnit angleUnit) const { return static_cast(Expression::setSign(s, context, angleUnit)); } protected: Number() : Expression() {} - NumberNode * node() const override { return static_cast(Expression::node()); } + NumberNode * node() const { return static_cast(Expression::node()); } private: typedef Integer (*IntegerBinaryOperation)(const Integer & i, const Integer & j); typedef Rational (*RationalBinaryOperation)(const Rational & i, const Rational & j); diff --git a/poincare/include/poincare/rational.h b/poincare/include/poincare/rational.h index 412527107..5c32f5561 100644 --- a/poincare/include/poincare/rational.h +++ b/poincare/include/poincare/rational.h @@ -86,7 +86,7 @@ public: Rational(native_int_t i, native_int_t j) : Rational(Integer(i), Integer(j)) {} // TreeNode - RationalNode * node() const override { return static_cast(Number::node()); } + RationalNode * node() const { return static_cast(Number::node()); } // Properties Integer signedIntegerNumerator() const; diff --git a/poincare/include/poincare/symbol.h b/poincare/include/poincare/symbol.h index f64089d5d..8948ef53c 100644 --- a/poincare/include/poincare/symbol.h +++ b/poincare/include/poincare/symbol.h @@ -116,7 +116,7 @@ public: // Symbol char name() const { return node()->name(); } private: - SymbolNode * node() const override { return static_cast(Expression::node()); } + SymbolNode * node() const { return static_cast(Expression::node()); } }; } diff --git a/poincare/include/poincare/tree_by_reference.h b/poincare/include/poincare/tree_by_reference.h index e6385b15b..af6a91b11 100644 --- a/poincare/include/poincare/tree_by_reference.h +++ b/poincare/include/poincare/tree_by_reference.h @@ -37,7 +37,7 @@ public: TreeByReference clone() const; int identifier() const { return m_identifier; } - virtual TreeNode * node() const { return TreePool::sharedPool()->node(m_identifier); } + TreeNode * node() const { return TreePool::sharedPool()->node(m_identifier); } bool isGhost() const { return node()->isGhost(); } bool isUninitialized() const { return node()->isUninitialized(); } diff --git a/poincare/include/poincare/tree_by_value.h b/poincare/include/poincare/tree_by_value.h index 7a12f12f0..b1bcdd514 100644 --- a/poincare/include/poincare/tree_by_value.h +++ b/poincare/include/poincare/tree_by_value.h @@ -22,7 +22,7 @@ public: bool isUninitialized() const { return TreeByReference::isUninitialized(); } bool isAllocationFailure() const { return TreeByReference::isAllocationFailure(); } - TreeNode * node() const override { return TreeByReference::node(); } + TreeNode * node() const { return TreeByReference::node(); } /* Hierarchy */ int numberOfChildren() const { return TreeByReference::numberOfChildren(); } diff --git a/poincare/test/tree/blob_node.h b/poincare/test/tree/blob_node.h index 5fa905bf0..f9ff9411e 100644 --- a/poincare/test/tree/blob_node.h +++ b/poincare/test/tree/blob_node.h @@ -61,7 +61,7 @@ public: } int data() { return node()->data(); } private: - BlobNode * node() const override { return static_cast(TreeByReference::node()); } + BlobNode * node() const { return static_cast(TreeByReference::node()); } }; @@ -72,7 +72,7 @@ public: } int data() { return node()->data(); } private: - BlobNode * node() const override { return static_cast(TreeByValue::node()); } + BlobNode * node() const { return static_cast(TreeByValue::node()); } };