Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const option::Descriptor usage[] = {
},

{
optionIndex::DOMAIN,
optionIndex::DOMAIN_ID,
0,
"",
"domain",
Expand Down Expand Up @@ -260,7 +260,7 @@ ProcessReturnCode parse_arguments(
utils::VerbosityKind(static_cast<int>(from_string_LogKind(opt.arg)));
break;

case optionIndex::DOMAIN:
case optionIndex::DOMAIN_ID:
{
const auto max_domain_id = static_cast<long>(ddspipe::core::types::DomainId::MAX_DOMAIN_ID);
long domain_value = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ enum optionIndex
VERSION,
LOG_FILTER,
LOG_VERBOSITY,
DOMAIN,
DOMAIN_ID,
};

/**
Expand Down
6 changes: 2 additions & 4 deletions fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,9 @@ void Configuration::load_dds_configuration_(

for (const auto& topic: manual_topics)
{
const std::string key(topic.first->topic_name);
const std::string key(topic.first->topic_name.get_reference());

// force an unambiguous std::string
const std::string filter =
static_cast<std::string>(topic.first->content_topic_filter);
const std::string filter = topic.first->content_topic_filter.get_reference();

auto ret = dds_configuration->content_topic_filter_dict.insert(
std::make_pair(key, filter)
Expand Down
Loading