From 5c06dedf7c9350f21eeec37b088ad84097abc4d5 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Thu, 24 Sep 2015 10:30:25 +0200
Subject: [PATCH] data: Fixed inheritance parsing for tests

---
 bin/test/data/log/test_log.txt         | 68 ++++++++++++++++++++++++++
 src/lib/data/parser/cxx/ASTVisitor.cpp |  2 +-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt
index 8cdb1410..ad041933 100644
--- a/bin/test/data/log/test_log.txt
+++ b/bin/test/data/log/test_log.txt
@@ -234,6 +234,74 @@ ConfigManager.cpp WARNING: value Int is not present in config.
 ConfigManager.cpp WARNING: value Float is not present in config.
 ConfigManager.cpp WARNING: value String is not present in config.
 ConfigManager.cpp WARNING: value NewBool is not present in config.
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: typedef: type -> int <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: class: Class <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: struct: Struct <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: global: Global <file.cpp 1:42 1:42>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: global: Global <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: field: m_field <file.cpp 1:3 1:3>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: field: Struct::m_field <file.cpp 1:11 1:11>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:14 1:14>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: method: isMethod <file.cpp 1:9 1:9>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: method: Class::isMethod <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: namespace: utility <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: enum: Category <file.cpp 1:17 1:17>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: enum: Class::Category <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: enum constant: VALUE <file.cpp 1:1 1:1>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: class: ClassA <file.cpp 1:0 1:0>
+Storage.cpp INFO: class: ClassB <file.cpp 1:0 1:0>
+Storage.cpp INFO: inheritance: ClassB : ClassA <file.cpp 1:5 1:5>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: struct: StructA <file.cpp 1:0 1:0>
+Storage.cpp INFO: struct: StructB <file.cpp 1:0 1:0>
+Storage.cpp INFO: inheritance: StructB : StructA <file.cpp 1:5 1:5>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: method: A::isMethod <file.cpp 1:9 1:9>
+Storage.cpp INFO: method: B::isMethod <file.cpp 1:7 1:7>
+Storage.cpp INFO: override: A::isMethod -> B::isMethod <file.cpp 1:4 1:4>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: func <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: isTrue -> func <file.cpp 1:9 1:9>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: global: global <file.cpp 1:0 1:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: call: global -> isTrue <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: field: Foo::m_field <file.cpp 1:0 1:0>
+Storage.cpp INFO: field usage: isTrue -> Foo::m_field <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: global: global <file.cpp 1:0 1:0>
+Storage.cpp INFO: global usage: isTrue -> global <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: function: isTrue <file.cpp 1:0 1:0>
+Storage.cpp INFO: struct: Struct <file.cpp 1:0 1:0>
+Storage.cpp INFO: type usage: isTrue -> Struct <file.cpp 1:0 1:0>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: include: file.h <file.cpp 1:7 1:7>
+Storage.cpp INFO: file: file.cpp < 0:0 0:0>
+Storage.cpp INFO: file: file.h < 0:0 0:0>
 TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
 TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
diff --git a/src/lib/data/parser/cxx/ASTVisitor.cpp b/src/lib/data/parser/cxx/ASTVisitor.cpp
index 0e5b1286..00ce2cca 100644
--- a/src/lib/data/parser/cxx/ASTVisitor.cpp
+++ b/src/lib/data/parser/cxx/ASTVisitor.cpp
@@ -74,7 +74,7 @@ bool ASTVisitor::VisitCXXRecordDecl(clang::CXXRecordDecl* declaration)
 		}
 
 		if ((declaration->isClass() || declaration->isStruct()) &&
-			declaration->hasBody() && declaration->hasDefinition() && declaration->getNumBases())
+			declaration->hasDefinition() && declaration->getDefinition() == declaration && declaration->getNumBases())
 		{
 			for (const clang::CXXBaseSpecifier& it : declaration->bases())
 			{