From 7c1e266c6a265ab8f665f084e1c697aac729b723 Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Tue, 9 Jun 2015 17:02:04 +0200 Subject: [PATCH] Fix -Winconsistent-missing-override on clang. TODO: Use override keyword. --- alib2data/src/graph/common/Node.h | 6 +++--- alib2data/src/graph/directed/DirectedEdge.h | 6 +++--- alib2data/src/graph/directed/DirectedGraph.h | 2 +- alib2data/src/graph/undirected/UndirectedEdge.h | 6 +++--- alib2data/src/graph/undirected/UndirectedGraph.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alib2data/src/graph/common/Node.h b/alib2data/src/graph/common/Node.h index cc52dc5f47..fd5d4f444e 100644 --- a/alib2data/src/graph/common/Node.h +++ b/alib2data/src/graph/common/Node.h @@ -22,8 +22,8 @@ public: Node &operator=(const Node &other); Node &operator=(Node &&other) noexcept; - GraphElement *clone() const; - GraphElement *plunder() &&; + GraphElement *clone() const override; + GraphElement *plunder() && override; const label::Label &getName() const; @@ -32,7 +32,7 @@ public: return -other.compare(*this); } - int compare(const Node &other) const; + int compare(const Node &other) const override; void operator>>(std::ostream &out) const override; diff --git a/alib2data/src/graph/directed/DirectedEdge.h b/alib2data/src/graph/directed/DirectedEdge.h index 6700f6f040..c8e7f89c64 100644 --- a/alib2data/src/graph/directed/DirectedEdge.h +++ b/alib2data/src/graph/directed/DirectedEdge.h @@ -27,8 +27,8 @@ public: DirectedEdge &operator=(const DirectedEdge &other); DirectedEdge &operator=(DirectedEdge &&other) noexcept; - GraphElement *clone() const; - GraphElement *plunder() &&; + GraphElement *clone() const override; + GraphElement *plunder() && override; const Node &getFromNode() const; const Node &getToNode() const; @@ -39,7 +39,7 @@ public: return -other.compare(*this); } - int compare(const DirectedEdge &other) const; + int compare(const DirectedEdge &other) const override; void operator>>(std::ostream &out) const override; diff --git a/alib2data/src/graph/directed/DirectedGraph.h b/alib2data/src/graph/directed/DirectedGraph.h index 3cf5b7b0f7..cd954aad80 100644 --- a/alib2data/src/graph/directed/DirectedGraph.h +++ b/alib2data/src/graph/directed/DirectedGraph.h @@ -61,7 +61,7 @@ public: return -other.compare(*this); } - int compare(const DirectedGraph &other) const; + int compare(const DirectedGraph &other) const override; void operator>>(std::ostream &out) const override; diff --git a/alib2data/src/graph/undirected/UndirectedEdge.h b/alib2data/src/graph/undirected/UndirectedEdge.h index 2b5a8bf925..1444be262c 100644 --- a/alib2data/src/graph/undirected/UndirectedEdge.h +++ b/alib2data/src/graph/undirected/UndirectedEdge.h @@ -27,8 +27,8 @@ public: UndirectedEdge &operator=(const UndirectedEdge &other); UndirectedEdge &operator=(UndirectedEdge &&other) noexcept; - GraphElement *clone() const; - GraphElement *plunder() &&; + GraphElement *clone() const override; + GraphElement *plunder() && override; const Node &getFirstNode() const; const Node &getSecondNode() const; @@ -39,7 +39,7 @@ public: return -other.compare(*this); } - int compare(const UndirectedEdge &other) const; + int compare(const UndirectedEdge &other) const override; void operator>>(std::ostream &out) const override; diff --git a/alib2data/src/graph/undirected/UndirectedGraph.h b/alib2data/src/graph/undirected/UndirectedGraph.h index 26e349bdd3..49d82f201f 100644 --- a/alib2data/src/graph/undirected/UndirectedGraph.h +++ b/alib2data/src/graph/undirected/UndirectedGraph.h @@ -61,7 +61,7 @@ public: return -other.compare(*this); } - int compare(const UndirectedGraph &other) const; + int compare(const UndirectedGraph &other) const override; void operator>>(std::ostream &out) const override; -- GitLab