From 011d5e5fecb59ce2a6d09cc03c108aa6a0b80015 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 3 Dec 2023 23:47:19 +0100 Subject: [PATCH] Fixed building clanguml internal diagrams on macos (#210) --- src/common/generators/generators.h | 5 ++--- src/sequence_diagram/visitor/translation_unit_visitor.cc | 2 +- uml/sequence/cli_handle_options_sequence.yml | 3 +-- uml/sequence/diagram_generate_generic_sequence.yml | 2 +- uml/sequence/load_config_sequence.yml | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/common/generators/generators.h b/src/common/generators/generators.h index 15a1558b..79c694c7 100644 --- a/src/common/generators/generators.h +++ b/src/common/generators/generators.h @@ -397,7 +397,6 @@ std::unique_ptr generate(const common::compilation_database &db, /** * @brief Generate a single diagram * - * @param od Output directory path * @param name Name of the diagram * @param diagram Effective diagram configuration * @param db Reference to compilation database @@ -406,7 +405,7 @@ std::unique_ptr generate(const common::compilation_database &db, * @param verbose Log level * @param progress Function to report translation unit progress */ -void generate_diagram(const std::string &od, const std::string &name, +void generate_diagram(const std::string &name, std::shared_ptr diagram, const common::compilation_database &db, const std::vector &translation_units, @@ -441,4 +440,4 @@ void generate_diagrams(const std::vector &diagram_names, */ indicators::Color diagram_type_to_color(model::diagram_t diagram_type); -} // namespace clanguml::common::generators \ No newline at end of file +} // namespace clanguml::common::generators diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc index fbae4dcc..7642ef2a 100644 --- a/src/sequence_diagram/visitor/translation_unit_visitor.cc +++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc @@ -1940,7 +1940,7 @@ void translation_unit_visitor::process_template_specialization_argument( .getAsTemplateDecl() ->getQualifiedNameAsString(); - argument.set_name(nested_template_name); + argument.set_type(nested_template_name); auto nested_template_instantiation = build_template_instantiation( *nested_template_type, &template_instantiation); diff --git a/uml/sequence/cli_handle_options_sequence.yml b/uml/sequence/cli_handle_options_sequence.yml index 341edc60..84b54bdf 100644 --- a/uml/sequence/cli_handle_options_sequence.yml +++ b/uml/sequence/cli_handle_options_sequence.yml @@ -10,7 +10,6 @@ glob: include: namespaces: - clanguml - - YAML exclude: elements: - r: "clanguml::config::option.*" @@ -21,4 +20,4 @@ exclude: using_namespace: - clanguml from: - - function: "clanguml::cli::cli_handler::handle_options(int,const char **)" \ No newline at end of file + - function: "clanguml::cli::cli_handler::handle_options(int,const char **)" diff --git a/uml/sequence/diagram_generate_generic_sequence.yml b/uml/sequence/diagram_generate_generic_sequence.yml index 01465c8b..9463ed3d 100644 --- a/uml/sequence/diagram_generate_generic_sequence.yml +++ b/uml/sequence/diagram_generate_generic_sequence.yml @@ -13,4 +13,4 @@ exclude: paths: - src/common/model/source_location.h from: - - function: "clanguml::common::generators::generate_diagram(const std::string &,const std::string &,std::shared_ptr,const common::compilation_database &,const std::vector &,const cli::runtime_config &,std::function &&)" \ No newline at end of file + - function: "clanguml::common::generators::generate_diagram(const std::string &,std::shared_ptr,const common::compilation_database &,const std::vector &,const cli::runtime_config &,std::function &&)" diff --git a/uml/sequence/load_config_sequence.yml b/uml/sequence/load_config_sequence.yml index 8087d842..78036a50 100644 --- a/uml/sequence/load_config_sequence.yml +++ b/uml/sequence/load_config_sequence.yml @@ -8,7 +8,6 @@ glob: include: namespaces: - clanguml - - YAML exclude: elements: - r: "clanguml::config::option.*" @@ -17,4 +16,4 @@ exclude: using_namespace: - clanguml from: - - function: "clanguml::config::load(const std::string &,std::optional,std::optional,bool)" \ No newline at end of file + - function: "clanguml::config::load(const std::string &,bool,std::optional,std::optional,bool)"