Merge pull request #212 from bkryza/fix-make-clangumldiagrams-on-macos

Fixed building clanguml internal diagrams on macos (#210)
This commit is contained in:
Bartek Kryza
2023-12-04 10:11:31 +01:00
committed by GitHub
5 changed files with 6 additions and 9 deletions

View File

@@ -397,7 +397,6 @@ std::unique_ptr<DiagramModel> generate(const common::compilation_database &db,
/** /**
* @brief Generate a single diagram * @brief Generate a single diagram
* *
* @param od Output directory path
* @param name Name of the diagram * @param name Name of the diagram
* @param diagram Effective diagram configuration * @param diagram Effective diagram configuration
* @param db Reference to compilation database * @param db Reference to compilation database
@@ -406,7 +405,7 @@ std::unique_ptr<DiagramModel> generate(const common::compilation_database &db,
* @param verbose Log level * @param verbose Log level
* @param progress Function to report translation unit progress * @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<clanguml::config::diagram> diagram, std::shared_ptr<clanguml::config::diagram> diagram,
const common::compilation_database &db, const common::compilation_database &db,
const std::vector<std::string> &translation_units, const std::vector<std::string> &translation_units,

View File

@@ -1940,7 +1940,7 @@ void translation_unit_visitor::process_template_specialization_argument(
.getAsTemplateDecl() .getAsTemplateDecl()
->getQualifiedNameAsString(); ->getQualifiedNameAsString();
argument.set_name(nested_template_name); argument.set_type(nested_template_name);
auto nested_template_instantiation = build_template_instantiation( auto nested_template_instantiation = build_template_instantiation(
*nested_template_type, &template_instantiation); *nested_template_type, &template_instantiation);

View File

@@ -10,7 +10,6 @@ glob:
include: include:
namespaces: namespaces:
- clanguml - clanguml
- YAML
exclude: exclude:
elements: elements:
- r: "clanguml::config::option.*" - r: "clanguml::config::option.*"

View File

@@ -13,4 +13,4 @@ exclude:
paths: paths:
- src/common/model/source_location.h - src/common/model/source_location.h
from: from:
- function: "clanguml::common::generators::generate_diagram(const std::string &,const std::string &,std::shared_ptr<clanguml::config::diagram>,const common::compilation_database &,const std::vector<std::string> &,const cli::runtime_config &,std::function<void ()> &&)" - function: "clanguml::common::generators::generate_diagram(const std::string &,std::shared_ptr<clanguml::config::diagram>,const common::compilation_database &,const std::vector<std::string> &,const cli::runtime_config &,std::function<void ()> &&)"

View File

@@ -8,7 +8,6 @@ glob:
include: include:
namespaces: namespaces:
- clanguml - clanguml
- YAML
exclude: exclude:
elements: elements:
- r: "clanguml::config::option.*" - r: "clanguml::config::option.*"
@@ -17,4 +16,4 @@ exclude:
using_namespace: using_namespace:
- clanguml - clanguml
from: from:
- function: "clanguml::config::load(const std::string &,std::optional<bool>,std::optional<bool>,bool)" - function: "clanguml::config::load(const std::string &,bool,std::optional<bool>,std::optional<bool>,bool)"