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

Fixed building on macos

Browse Source
This commit is contained in:
Bartek Kryza
2022-02-11 22:51:55 +01:00
parent 45c26f76a3
commit 8e73db6ccd
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/class_diagram/visitor/translation_unit_visitor.cc
View File

@@ -600,8 +600,10 @@ void translation_unit_visitor::process_field(
auto &tr = cx::util::unreferenced(cppast::remove_cv(mv.type()));
#ifndef __APPLE__
LOG_DBG("Processing field {} with unreferenced type of kind {}", mv.name(),
tr.kind());
#endif
if (tr.kind() == cppast::cpp_type_kind::builtin_t) {
LOG_DBG("Builtin type found for field: {}", m.name());
@@ -1076,8 +1078,10 @@ bool translation_unit_visitor::find_relationships(const cppast::cpp_type &t_,
const auto fn =
cx::util::full_name(cppast::remove_cv(t_), ctx.entity_index(), false);
#ifndef __APPLE__
LOG_DBG("Finding relationships for type {}, {}, {}", cppast::to_string(t_),
t_.kind(), fn);
#endif
relationship_t relationship_type = relationship_hint;
const auto &t = cppast::remove_cv(cx::util::unreferenced(t_));

9
src/package_diagram/model/package.h
View File

@@ -31,7 +31,7 @@
namespace clanguml::package_diagram::model {
namespace detail {
template <typename T, template <typename> class Container,
template <typename T, template <typename, typename> class Container,
typename Ptr = std::unique_ptr<T>>
class package_trait {
public:
@@ -104,8 +104,9 @@ public:
packages_.end();
}
typedef typename Container<Ptr>::iterator iterator;
typedef typename Container<Ptr>::const_iterator const_iterator;
typedef typename Container<Ptr, std::allocator<Ptr>>::iterator iterator;
typedef typename Container<Ptr, std::allocator<Ptr>>::const_iterator
const_iterator;
inline iterator begin() noexcept { return packages_.begin(); }
inline const_iterator cbegin() const noexcept { return packages_.cbegin(); }
@@ -113,7 +114,7 @@ public:
inline const_iterator cend() const noexcept { return packages_.cend(); }
protected:
Container<std::unique_ptr<T>> packages_;
Container<Ptr, std::allocator<Ptr>> packages_;
};
}

2
src/package_diagram/visitor/translation_unit_visitor.cc
View File

@@ -381,8 +381,10 @@ bool translation_unit_visitor::find_relationships(const cppast::cpp_type &t_,
const auto fn_ns = cx::util::ns(cppast::remove_cv(t_), ctx.entity_index());
#ifndef __APPLE__
LOG_DBG("Finding relationships for type {}, {}, {}", cppast::to_string(t_),
t_.kind(), fn);
#endif
relationship_t relationship_type = relationship_hint;
const auto &t = cppast::remove_cv(cx::util::unreferenced(t_));