Skip to content

Commit

Permalink
Fixed compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sonndinh committed Oct 23, 2023
1 parent 51577ae commit a2fbc12
Show file tree
Hide file tree
Showing 5 changed files with 337 additions and 406 deletions.
6 changes: 3 additions & 3 deletions dds/DCPS/XTypes/DynamicDataBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,15 @@ DDS::ReturnCode_t DynamicDataBase::get_selected_union_branch(
}
return DDS::RETCODE_ERROR;
}
return get_selected_union_branch(type_, static_cast<DDS::Int32>(i64_disc),
found_selected_member, selected_md);
return XTypes::get_selected_union_branch(type_, static_cast<DDS::Int32>(i64_disc),
found_selected_member, selected_md);
}

bool DynamicDataBase::discriminator_selects_no_member(DDS::Int32 disc) const
{
bool found_selected_member;
DDS::MemberDescriptor_var selected_md;
const DDS::ReturnCode_t rc = get_selected_union_branch(type_, disc, found_selected_member, selected_md);
const DDS::ReturnCode_t rc = XTypes::get_selected_union_branch(type_, disc, found_selected_member, selected_md);
if (rc != DDS::RETCODE_OK) {
if (log_level >= LogLevel::Warning) {
ACE_ERROR((LM_WARNING, "(%P|%t) WARNING: DynamicDataBase::discriminator_selects_no_member: "
Expand Down
Loading

0 comments on commit a2fbc12

Please sign in to comment.