Changed as requested by reviewer.

score-p · Jun 12, 2019 · a7421dd · a7421dd
1 parent b5b0dbf
commit a7421dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/definition_reader.cpp b/src/definition_reader.cpp
@@ -477,9 +477,7 @@ void DefinitionReader::handleDefinition(SystemTreeNode &sysTreeNode) {
 
   else {
     if (sysTreeNode.s_parent == OTF2_UNDEFINED_SYSTEM_TREE_NODE) {
-      auto status(m_traceDefs.verifyAbstractParent(sysTreeNode.s_name));
-      if (status == true)
-        sysTreeNode.s_parent = 0;
+      sysTreeNode.s_parent = m_traceDefs.getAbstractParent(sysTreeNode.s_name);
     } else {
       sysTreeNode.s_parent = m_maps.getSystemTreeNodeID(sysTreeNode.s_parent);
     }

diff --git a/src/definition_store.cpp b/src/definition_store.cpp
@@ -142,14 +142,14 @@ bool DefinitionStore::hasAbstractNode() {
   return false;
 }
 
-bool DefinitionStore::verifyAbstractParent(const size_t sysNodeName) {
+uint32_t DefinitionStore::getAbstractParent(const size_t sysNodeName) {
   if (m_sysTreeNodeDb.size() > 1) {
     if (m_sysTreeNodeDb[1].s_name != sysNodeName) {
       m_sysTreeNodeDb[0].s_newRootparent = true;
-      return true;
+      return 0;
     }
   }
-  return false;
+  return OTF2_UNDEFINED_SYSTEM_TREE_NODE;
 }
 
 std::tuple<vector<SystemTreeNode>::iterator, vector<SystemTreeNode>::iterator>

diff --git a/src/include/definition_store.h b/src/include/definition_store.h
@@ -268,7 +268,7 @@ class DefinitionStore {
 
   bool hasAbstractNode();
   size_t insertDefinition(SystemTreeNode &sysTreeNode);
-  bool verifyAbstractParent(const size_t sysNodeName);
+  uint32_t getAbstractParent(const size_t sysNodeName);
 
   std::tuple<vector<SystemTreeNode>::iterator, vector<SystemTreeNode>::iterator>
   getSystemTreeNodeRange();

diff --git a/src/maps.cpp b/src/maps.cpp
@@ -128,7 +128,8 @@ void Maps::insertIoFileProperty(
 }
 
 void Maps::insertIoFileDefinitionToDatabase() {
-  for (auto iter = m_ioFileDefinition.begin(); iter != m_ioFileDefinition.end();
+  vector<IoFileDefinition>::iterator iter;
+  for (iter = m_ioFileDefinition.begin(); iter != m_ioFileDefinition.end();
        ++iter) {
     auto id = m_traceDefs.insertDefinition(*iter);
     mapIoFileAndDirectory(id);