Merge pull request #36 from CoatiSoftware/remove_aggregation_edge

remove AGGREGATION edge kind (issue #10)
CoatiSoftware · Oct 12, 2020 · e483808 · e483808
2 parents 962fae6 + 5bc16dd
commit e483808
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/include/EdgeKind.h b/core/include/EdgeKind.h
@@ -41,8 +41,7 @@ namespace sourcetrail
 		TEMPLATE_SPECIALIZATION = 1 << 7,
 		INCLUDE = 1 << 8,
 		IMPORT = 1 << 9,
-		AGGREGATION = 1 << 10,
-		MACRO_USAGE = 1 << 11,
+		MACRO_USAGE = 1 << 11, // needs new db version if decremented
 		ANNOTATION_USAGE = 1 << 12
 	};
 

diff --git a/core/src/EdgeKind.cpp b/core/src/EdgeKind.cpp
@@ -38,7 +38,6 @@ namespace sourcetrail
 			EdgeKind::TEMPLATE_SPECIALIZATION,
 			EdgeKind::INCLUDE,
 			EdgeKind::IMPORT,
-			EdgeKind::AGGREGATION,
 			EdgeKind::MACRO_USAGE
 		};