Skip to content

Rename enum DOMAIN to avoid System V macro conflict #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srmainwaring wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename enum DOMAIN to avoid System V macro conflict #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/fastdds_monitor/model/logical/DomainModelItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DomainModelItem : public EntityContainerModelItem<TopicModelItem, ListMode
//! Overwriter entity kind
virtual backend::EntityKind backend_kind() const override
{
return backend::EntityKind::DOMAIN;
return backend::EntityKind::DOMAIN_ENTITY;
}

};
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/headers/Domain.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Domain : public Entity
//! Overwrite of \c kind method from Entity
EntityKind kind() const override
{
return EntityKind::DOMAIN;
return EntityKind::DOMAIN_ENTITY;
}

private:
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Domain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ std::vector<EntityId> Domain::get_entities(
case EntityKind::PARTICIPANT:
return get_ids(participants_);

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
return ids;

case EntityKind::TOPIC:
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Endpoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ std::vector<EntityId> Endpoint::get_entities(
ids.push_back(participant_->id());
return ids;

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:

case EntityKind::DATAWRITER:
case EntityKind::DATAREADER:
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ std::vector<EntityId> Host::get_entities(
return get_ids(users_);

case EntityKind::PROCESS:
case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
case EntityKind::TOPIC:
case EntityKind::PARTICIPANT:
case EntityKind::DATAWRITER:
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Locator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ std::vector<EntityId> Locator::get_entities(
case EntityKind::USER:
case EntityKind::PROCESS:
case EntityKind::PARTICIPANT:
case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
case EntityKind::TOPIC:
return get_entities_related(endpoints_, entity_type);

Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Participant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ std::vector<EntityId> Participant::get_entities(
case EntityKind::PARTICIPANT:
return ids;

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
ids.push_back(domain_->id());
return ids;

Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ std::vector<EntityId> Process::get_entities(
case EntityKind::PARTICIPANT:
return get_ids(participants_);

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
case EntityKind::TOPIC:
case EntityKind::DATAWRITER:
case EntityKind::DATAREADER:
Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/Topic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ std::vector<EntityId> Topic::get_entities(
case EntityKind::PARTICIPANT:
return get_entities_related(endpoints_, entity_type);

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
ids.push_back(domain_->id());
return ids;

Expand Down
2 changes: 1 addition & 1 deletion mock/complex_mock/entities/source/User.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ std::vector<EntityId> User::get_entities(
case EntityKind::PROCESS:
return get_ids(processes_);

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
case EntityKind::TOPIC:
case EntityKind::PARTICIPANT:
case EntityKind::DATAWRITER:
Expand Down
4 changes: 2 additions & 2 deletions mock/static_mock/StatisticsBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ std::vector<EntityId> StatisticsBackend::get_entities(
result.push_back(3);
break;

case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
result.push_back(4);
break;

Expand Down Expand Up @@ -181,7 +181,7 @@ EntityKind StatisticsBackend::get_type(
return EntityKind::PROCESS;

case 4:
return EntityKind::DOMAIN;
return EntityKind::DOMAIN_ENTITY;

case 5:
return EntityKind::TOPIC;
Expand Down
2 changes: 1 addition & 1 deletion src/Controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void Controller::process_click(
void Controller::domain_click(
QString id)
{
engine_->entity_clicked(backend::models_id_to_backend_id(id), backend::EntityKind::DOMAIN);
engine_->entity_clicked(backend::models_id_to_backend_id(id), backend::EntityKind::DOMAIN_ENTITY);
}

void Controller::topic_click(
Expand Down
8 changes: 4 additions & 4 deletions src/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void Engine::shared_init_monitor_(
// This, entity_clicked must be called but do not update dds model (but reset it)
update_entity(domain_id, &Engine::update_domain, true, false);

entity_clicked(domain_id, backend::EntityKind::DOMAIN, false);
entity_clicked(domain_id, backend::EntityKind::DOMAIN_ENTITY, false);

emit controller_->monitorInitialized();
}
Expand Down Expand Up @@ -917,7 +917,7 @@ bool Engine::update_entity_generic(
return update_entity(
entity_id, &Engine::update_process, !is_update, is_last_clicked);

case backend::EntityKind::DOMAIN:
case backend::EntityKind::DOMAIN_ENTITY:
return update_entity(
entity_id, &Engine::update_domain, !is_update, is_last_clicked);

Expand Down Expand Up @@ -1104,7 +1104,7 @@ void Engine::set_alias(
update_entity(entity_id, &Engine::update_process, false);
break;

case backend::EntityKind::DOMAIN:
case backend::EntityKind::DOMAIN_ENTITY:
update_entity(entity_id, &Engine::update_domain, false);
break;

Expand Down Expand Up @@ -1331,7 +1331,7 @@ EntitiesClicked::click(
case backend::EntityKind::HOST:
case backend::EntityKind::USER:
case backend::EntityKind::PROCESS:
case backend::EntityKind::DOMAIN:
case backend::EntityKind::DOMAIN_ENTITY:
case backend::EntityKind::TOPIC:
std::get<2>(result) = unclick_dds();
std::get<1>(result) = physical_logical.set(clicked_entity, clicked_kind);
Expand Down
4 changes: 2 additions & 2 deletions src/backend/SyncBackendConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ bool SyncBackendConnection::update_logical_model(

return update_model_(
logical_model,
EntityKind::DOMAIN,
EntityKind::DOMAIN_ENTITY,
ID_ALL,
&SyncBackendConnection::update_domain_item,
&SyncBackendConnection::create_domain_data_,
Expand Down Expand Up @@ -948,7 +948,7 @@ bool SyncBackendConnection::update_topic(
bool last_clicked)
{
// Get Domain model where this Topic belongs
ListModel* domain_model = get_model_(logical_model, id, EntityKind::DOMAIN);
ListModel* domain_model = get_model_(logical_model, id, EntityKind::DOMAIN_ENTITY);

if (domain_model == nullptr)
{
Expand Down
4 changes: 2 additions & 2 deletions src/backend/backend_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ QString entity_kind_to_QString(
return "User";
case EntityKind::PROCESS:
return "Process";
case EntityKind::DOMAIN:
case EntityKind::DOMAIN_ENTITY:
return "Domain";
case EntityKind::TOPIC:
return "Topic";
Expand Down Expand Up @@ -176,7 +176,7 @@ EntityKind string_to_entity_kind(
{"Host", EntityKind::HOST},
{"User", EntityKind::USER},
{"Process", EntityKind::PROCESS},
{"Domain", EntityKind::DOMAIN},
{"Domain", EntityKind::DOMAIN_ENTITY},
{"Topic", EntityKind::TOPIC},
{"DomainParticipant", EntityKind::PARTICIPANT},
{"DataWriter", EntityKind::DATAWRITER},
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/utils/backend_utilsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ TEST(utilsBackendTest, string_to_entity_kind)
{"Host", EntityKind::HOST},
{"User", EntityKind::USER},
{"Process", EntityKind::PROCESS},
{"Domain", EntityKind::DOMAIN},
{"Domain", EntityKind::DOMAIN_ENTITY},
{"Topic", EntityKind::TOPIC},
{"DomainParticipant", EntityKind::PARTICIPANT},
{"DataWriter", EntityKind::DATAWRITER},
Expand Down