Skip to content
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.

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

[21092] Run selected VS tool on Windows CI (backport #4854) #4868

Merged
merged 2 commits into from
Jun 5, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
colcon_build_args: ${{ inputs.colcon-args }}
# The following Fast DDS CMake options need to be specified here instead of in the ci.meta file
# because they vary from platform to platform
cmake_args_default: ${{ inputs.cmake-args }} -DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"
cmake_args_default: ${{ inputs.cmake-args }} -T ${{ matrix.vs-toolset }} -DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"
cmake_build_type: ${{ matrix.cmake-config }}
workspace: ${{ github.workspace }}

Expand Down
28 changes: 14 additions & 14 deletions src/cpp/statistics/rtps/StatisticsBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ StatisticsAncillary* StatisticsListenersImpl::get_aux_members() const
}

bool StatisticsListenersImpl::add_statistics_listener_impl(
std::shared_ptr<fastdds::statistics::IListener> listener)
std::shared_ptr<eprosima::fastdds::statistics::IListener> listener)
{
if (!listener)
{
Expand All @@ -115,7 +115,7 @@ bool StatisticsListenersImpl::add_statistics_listener_impl(
}

bool StatisticsListenersImpl::remove_statistics_listener_impl(
std::shared_ptr<fastdds::statistics::IListener> listener)
std::shared_ptr<eprosima::fastdds::statistics::IListener> listener)
{
std::lock_guard<fastrtps::RecursiveTimedMutex> lock(get_statistics_mutex());

Expand Down Expand Up @@ -200,7 +200,7 @@ bool StatisticsParticipantImpl::are_readers_involved(
}

bool StatisticsParticipantImpl::add_statistics_listener(
std::shared_ptr<fastdds::statistics::IListener> listener,
std::shared_ptr<eprosima::fastdds::statistics::IListener> listener,
uint32_t kind)
{
std::unique_lock<std::recursive_mutex> lock(get_statistics_mutex());
Expand Down Expand Up @@ -261,7 +261,7 @@ bool StatisticsParticipantImpl::add_statistics_listener(
}

bool StatisticsParticipantImpl::remove_statistics_listener(
std::shared_ptr<fastdds::statistics::IListener> listener,
std::shared_ptr<eprosima::fastdds::statistics::IListener> listener,
uint32_t kind)
{
std::unique_lock<std::recursive_mutex> lock(get_statistics_mutex());
Expand Down Expand Up @@ -330,9 +330,9 @@ bool StatisticsParticipantImpl::remove_statistics_listener(
}

void StatisticsParticipantImpl::on_network_statistics(
const fastrtps::rtps::GuidPrefix_t& source_participant,
const fastrtps::rtps::Locator_t& source_locator,
const fastrtps::rtps::Locator_t& reception_locator,
const eprosima::fastrtps::rtps::GuidPrefix_t& source_participant,
const eprosima::fastrtps::rtps::Locator_t& source_locator,
const eprosima::fastrtps::rtps::Locator_t& reception_locator,
const rtps::StatisticsSubmessageData& data,
uint64_t datagram_size)
{
Expand All @@ -343,8 +343,8 @@ void StatisticsParticipantImpl::on_network_statistics(
}

void StatisticsParticipantImpl::process_network_timestamp(
const fastrtps::rtps::GuidPrefix_t& source_participant,
const fastrtps::rtps::Locator_t& reception_locator,
const eprosima::fastrtps::rtps::GuidPrefix_t& source_participant,
const eprosima::fastrtps::rtps::Locator_t& reception_locator,
const rtps::StatisticsSubmessageData::TimeStamp& ts)
{
using namespace eprosima::fastrtps::rtps;
Expand Down Expand Up @@ -377,8 +377,8 @@ void StatisticsParticipantImpl::process_network_timestamp(
}

void StatisticsParticipantImpl::process_network_sequence(
const fastrtps::rtps::GuidPrefix_t& source_participant,
const fastrtps::rtps::Locator_t& reception_locator,
const eprosima::fastrtps::rtps::GuidPrefix_t& source_participant,
const eprosima::fastrtps::rtps::Locator_t& reception_locator,
const rtps::StatisticsSubmessageData::Sequence& seq,
uint64_t datagram_size)
{
Expand Down Expand Up @@ -445,7 +445,7 @@ void StatisticsParticipantImpl::process_network_sequence(
}

void StatisticsParticipantImpl::on_rtps_sent(
const fastrtps::rtps::Locator_t& loc,
const eprosima::fastrtps::rtps::Locator_t& loc,
unsigned long payload_size)
{
using namespace std;
Expand Down Expand Up @@ -477,8 +477,8 @@ void StatisticsParticipantImpl::on_rtps_sent(
}

void StatisticsParticipantImpl::on_entity_discovery(
const fastrtps::rtps::GUID_t& id,
const fastdds::dds::ParameterPropertyList_t& properties)
const eprosima::fastrtps::rtps::GUID_t& id,
const eprosima::fastdds::dds::ParameterPropertyList_t& properties)
{
using namespace fastrtps;

Expand Down
4 changes: 2 additions & 2 deletions src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ const GUID_t& StatisticsReaderImpl::get_guid() const
}

void StatisticsReaderImpl::on_data_notify(
const fastrtps::rtps::GUID_t& writer_guid,
const fastrtps::rtps::Time_t& source_timestamp)
const eprosima::fastrtps::rtps::GUID_t& writer_guid,
const eprosima::fastrtps::rtps::Time_t& source_timestamp)
{
// Get current timestamp
fastrtps::rtps::Time_t current_time;
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const GUID_t& StatisticsWriterImpl::get_guid() const
}

void StatisticsWriterImpl::on_sample_datas(
const fastrtps::rtps::SampleIdentity& sample_identity,
const eprosima::fastrtps::rtps::SampleIdentity& sample_identity,
size_t num_sent_submessages)
{
SampleIdentityCount notification;
Expand Down
Loading