More conversion to classes

[satune.git] / src / ASTAnalyses / ordernode.cc

diff --git a/src/ASTAnalyses/ordernode.cc b/src/ASTAnalyses/ordernode.cc
index c197a57e71510b56e1ca5c83f7307af0f60e79ce..02f314694d31039468b7e31e60f3f10d33cb3c88 100644 (file)
--- a/src/ASTAnalyses/ordernode.cc
+++ b/src/ASTAnalyses/ordernode.cc
@@ -1,26 +1,18 @@
 #include "ordernode.h"
 #include "orderedge.h"
 
-OrderNode *allocOrderNode(uint64_t id) {
-       OrderNode *This = (OrderNode *) ourmalloc(sizeof(OrderNode));
-       This->id = id;
-       This->inEdges = new HashSetOrderEdge();
-       This->outEdges = new HashSetOrderEdge();
-       This->status = NOTVISITED;
-       This->sccNum = 0;
-       return This;
+OrderNode::OrderNode(uint64_t _id) :
+       id(_id),
+       status(NOTVISITED),
+       sccNum(0),
+       inEdges(),
+       outEdges() {
 }
 
-void addNewIncomingEdge(OrderNode *node, OrderEdge *edge) {
-       node->inEdges->add(edge);
+void OrderNode::addNewIncomingEdge(OrderEdge *edge) {
+       inEdges.add(edge);
 }
 
-void addNewOutgoingEdge(OrderNode *node, OrderEdge *edge) {
-       node->outEdges->add(edge);
-}
-
-void deleteOrderNode(OrderNode *node) {
-       delete node->inEdges;
-       delete node->outEdges;
-       ourfree(node);
+void OrderNode::addNewOutgoingEdge(OrderEdge *edge) {
+       outEdges.add(edge);
 }