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

Renamed common::id_t to eid_t to avoid conflicts with system id_t

Browse Source
This commit is contained in:
Bartek Kryza
2024-06-05 21:19:46 +02:00
parent 2cf9d2f22a
commit 420475ab64
57 changed files with 370 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,8 @@
namespace clanguml::common::model {
using clanguml::common::eid_t;
/**
* Type of template parameter or argument.
*/
@@ -166,14 +168,14 @@ public:
*
* @param id Id of parameter
*/
void set_id(const common::id_t &id) { id_ = id; }
void set_id(const eid_t &id) { id_ = id; }
/**
* Get id of the template parameter
*
* @return Id of the template parameter
*/
const std::optional<common::id_t> &id() const { return id_; }
const std::optional<eid_t> &id() const { return id_; }
/**
* Set the name of the template parameter
@@ -389,7 +391,7 @@ public:
* @return
*/
bool find_nested_relationships(
std::vector<std::pair<common::id_t, common::model::relationship_t>>
std::vector<std::pair<eid_t, common::model::relationship_t>>
&nested_relationships,
common::model::relationship_t hint,
const std::function<bool(const std::string &full_name)> &should_include)
@@ -533,7 +535,7 @@ private:
*/
std::vector<template_parameter> template_params_;
std::optional<common::id_t> id_;
std::optional<eid_t> id_;
bool is_unexposed_{false};
};