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

Fix diagram generation using LLVM 17 (Fixes #190)

Browse Source
This commit is contained in:
Bartek Kryza
2023-10-13 18:46:30 +02:00
parent e7d6c94a14
commit a7b4efa80e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.clang-uml
View File

@@ -1,6 +1,8 @@
compilation_database_dir: debug compilation_database_dir: debug
output_directory: docs/diagrams output_directory: docs/diagrams
comment_parser: clang comment_parser: clang
remove_compile_flags:
- -Wno-class-memaccess
generate_links: generate_links:
link: "{% if existsIn(element, \"doxygen_link\") %}{{ element.doxygen_link }}{% endif %}" link: "{% if existsIn(element, \"doxygen_link\") %}{{ element.doxygen_link }}{% endif %}"
tooltip: "{% if existsIn(element, \"comment\") and existsIn(element.comment, \"brief\") %}{{ abbrv(trim(replace(element.comment.brief.0, \"\\n+\", \" \")), 256) }}{% else %}{{ element.name }}{% endif %}" tooltip: "{% if existsIn(element, \"comment\") and existsIn(element.comment, \"brief\") %}{{ abbrv(trim(replace(element.comment.brief.0, \"\\n+\", \" \")), 256) }}{% else %}{{ element.name }}{% endif %}"
@@ -72,4 +74,4 @@ diagrams:
include!: uml/package/architecture_package.yml include!: uml/package/architecture_package.yml
# Include diagrams # Include diagrams
include_graph: include_graph:
include!: uml/include/include.yml include!: uml/include/include.yml

4
CMakeLists.txt
View File

@@ -137,7 +137,9 @@ endif()
# and environment quirks # and environment quirks
# #
if(LLVM_VERSION_MAJOR GREATER_EQUAL 17) if(LLVM_VERSION_MAJOR GREATER_EQUAL 17)
set(CUSTOM_COMPILE_OPTIONS "-Wno-class-memaccess") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CUSTOM_COMPILE_OPTIONS "-Wno-class-memaccess")
endif()
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CUSTOM_COMPILE_OPTIONS set(CUSTOM_COMPILE_OPTIONS

2
src/common/model/template_parameter.h
View File

@@ -504,8 +504,6 @@ private:
/*! Whether template argument is ellipsis (...) */ /*! Whether template argument is ellipsis (...) */
bool is_ellipsis_{false}; bool is_ellipsis_{false};
bool is_noexcept_{false};
/*! Whether the template parameter is variadic */ /*! Whether the template parameter is variadic */
bool is_variadic_{false}; bool is_variadic_{false};

2
src/sequence_diagram/model/diagram.h
View File

@@ -328,8 +328,6 @@ private:
return block_end_types.count(mt) > 0; return block_end_types.count(mt) > 0;
}; };
bool started_{false};
std::map<common::model::diagram_element::id_t, activity> sequences_; std::map<common::model::diagram_element::id_t, activity> sequences_;
std::map<common::model::diagram_element::id_t, std::unique_ptr<participant>> std::map<common::model::diagram_element::id_t, std::unique_ptr<participant>>