Fix compiler warnings; clear object graph when it's not needed

diff --git a/src/analyze/gui/parser.cpp b/src/analyze/gui/parser.cpp
index b97a854..c4760d9 100644 (file)
--- a/src/analyze/gui/parser.cpp
+++ b/src/analyze/gui/parser.cpp
@@ -91,7 +91,7 @@ struct TypeTree {
             return result;
 
         if (node.m_children.size() == 0) {
-            result.push_back(std::move(create(node)));
+            result.push_back(create(node));
             return result;
         }
 
@@ -107,8 +107,8 @@ struct TypeTree {
                 }
                 childIt->m_parents.push_back(std::move(parent));
                 result.push_back(std::move(leaf));
-                auto parentCopy = create(node);
-                result.push_back(std::move(parentCopy));
+                // Add a copy of the parent to the top level
+                result.push_back(create(node));
             }
         }
 

diff --git a/src/track/objectgraph.h b/src/track/objectgraph.h
index ba8e2a7..44056d4 100644 (file)
--- a/src/track/objectgraph.h
+++ b/src/track/objectgraph.h
@@ -72,6 +72,7 @@ public:
         ObjectNode *node = &(it->second);
         eliminateLoops(node);
         node->print(gcCounter, out);
+        clear();
     }
 
     void clear() {