From 3fac5e69f3c95da8b406dd59e7327d5153bc5a24 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 2 Dec 2015 16:24:37 +0100 Subject: [PATCH] data: Fixed constructors and destructurs having return type use void without location --- bin/app/data/projects/tictactoe/src/field.cpp | 2 +- bin/app/data/src/tictactoe/field.cpp | 2 +- src/lib/data/Storage.cpp | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/app/data/projects/tictactoe/src/field.cpp b/bin/app/data/projects/tictactoe/src/field.cpp index 313ed89a..d87128a8 100644 --- a/bin/app/data/projects/tictactoe/src/field.cpp +++ b/bin/app/data/projects/tictactoe/src/field.cpp @@ -22,7 +22,7 @@ Field::Field() Field::~Field() { for ( int i = 0; i < 3; i++ ) { - delete grid_[i]; + delete [] grid_[i]; } delete [] grid_; } diff --git a/bin/app/data/src/tictactoe/field.cpp b/bin/app/data/src/tictactoe/field.cpp index 313ed89a..d87128a8 100644 --- a/bin/app/data/src/tictactoe/field.cpp +++ b/bin/app/data/src/tictactoe/field.cpp @@ -22,7 +22,7 @@ Field::Field() Field::~Field() { for ( int i = 0; i < 3; i++ ) { - delete grid_[i]; + delete [] grid_[i]; } delete [] grid_; } diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp index 87942c37..5a38eb06 100644 --- a/src/lib/data/Storage.cpp +++ b/src/lib/data/Storage.cpp @@ -311,9 +311,12 @@ Id Storage::onMethodParsed( addSourceLocation(nodeId, scopeLocation, true); addAccess(nodeId, access); - Id returnTypeNodeId = addNodeHierarchy(Node::NODE_TYPE, method.returnType.dataType->getTypeNameHierarchy(), false); - addEdge(nodeId, returnTypeNodeId, Edge::EDGE_TYPE_USAGE, method.returnType.location); - // addEdge(nodeId, returnTypeNodeId, Edge::EDGE_RETURN_TYPE_OF, method.returnType.location); + if (method.returnType.location.isValid()) + { + Id returnTypeNodeId = addNodeHierarchy(Node::NODE_TYPE, method.returnType.dataType->getTypeNameHierarchy(), false); + addEdge(nodeId, returnTypeNodeId, Edge::EDGE_TYPE_USAGE, method.returnType.location); + // addEdge(nodeId, returnTypeNodeId, Edge::EDGE_RETURN_TYPE_OF, method.returnType.location); + } for (size_t i = 0; i < method.parameters.size(); i++) {