matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed t00014 on macos (Fixes #176)

Browse Source
This commit is contained in:
Bartek Kryza
2023-12-05 23:11:36 +01:00
parent 9280edfafb
commit f1d3695ccc
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/model/relationship.h
View File

@@ -47,7 +47,7 @@ public:
* @param multiplicity_source Multiplicity at the source
* @param multiplicity_destination Multiplicity at the destination
*/
relationship(relationship_t type, int64_t destination,
relationship(relationship_t type, clanguml::common::id_t destination,
access_t access = access_t::kPublic, std::string label = "",
std::string multiplicity_source = "",
std::string multiplicity_destination = "");
@@ -144,7 +144,7 @@ public:
private:
relationship_t type_;
int64_t destination_;
clanguml::common::id_t destination_;
std::string multiplicity_source_;
std::string multiplicity_destination_;
std::string label_;

9
src/common/model/template_parameter.cc
View File

@@ -517,6 +517,9 @@ bool template_parameter::find_nested_relationships(
// just add it and skip recursion (e.g. this is a user defined type)
const auto maybe_type = type();
if (is_function_template())
hint = common::model::relationship_t::kDependency;
if (maybe_type && should_include(maybe_type.value())) {
if (is_association())
hint = common::model::relationship_t::kAssociation;
@@ -538,7 +541,8 @@ bool template_parameter::find_nested_relationships(
if (maybe_id && maybe_arg_type && should_include(*maybe_arg_type)) {
if (template_argument.is_association())
if (template_argument.is_association() &&
hint == common::model::relationship_t::kAggregation)
hint = common::model::relationship_t::kAssociation;
nested_relationships.emplace_back(maybe_id.value(), hint);
@@ -547,6 +551,9 @@ bool template_parameter::find_nested_relationships(
(hint == common::model::relationship_t::kAggregation);
}
else {
if (template_argument.is_function_template())
hint = common::model::relationship_t::kDependency;
added_aggregation_relationship =
template_argument.find_nested_relationships(
nested_relationships, hint, should_include);