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.

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

Jump to bottom

[20592][20679] Fix hidden overloaded virtual methods #4622

Merged
merged 1 commit into from
Apr 10, 2024
Merged

[20592][20679] Fix hidden overloaded virtual methods #4622

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 .github/workflows/reusable-ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
colcon_build_args: ${{ inputs.colcon-args }}
cmake_args: ${{ inputs.cmake-args }}
cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall"
cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wpedantic -Wunused-value -Woverloaded-virtual" -DFASTDDS_EXAMPLE_TESTS=ON
cmake_build_type: ${{ matrix.cmake-build-type }}
workspace: ${{ github.workspace }}

Expand Down
6 changes: 6 additions & 0 deletions examples/C++/DDS/LivelinessQoS/LivelinessSubscriber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,15 @@ class LivelinessSubscriber

class PartListener : public eprosima::fastdds::dds::DomainParticipantListener
{
public:

virtual void on_participant_discovery(
eprosima::fastdds::dds::DomainParticipant* participant,
eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;

private:

using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
};

PartListener part_listener_;
Expand Down
31 changes: 25 additions & 6 deletions examples/C++/RTPSTest_persistent/TestReaderPersistent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
class TestReaderPersistent
{
public:

TestReaderPersistent();
virtual ~TestReaderPersistent();
eprosima::fastrtps::rtps::RTPSParticipant* mp_participant;
Expand All @@ -36,23 +37,41 @@ class TestReaderPersistent
bool init(); //Initialization
bool reg(); //Register
void run(); //Run
class MyListener:public eprosima::fastrtps::rtps::ReaderListener
class MyListener : public eprosima::fastrtps::rtps::ReaderListener
{
public:
MyListener():n_received(0),n_matched(0){};
~MyListener(){};

MyListener()
: n_received(0)
, n_matched(0)
{
}

~MyListener()
{
}

void onNewCacheChangeAdded(
eprosima::fastrtps::rtps::RTPSReader* reader,
const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
void onReaderMatched(
eprosima::fastrtps::rtps::RTPSReader*,
eprosima::fastrtps::rtps::MatchingInfo& info) override
{
if(info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) n_matched++;
};
if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING)
{
n_matched++;
}
}

uint32_t n_received;
uint32_t n_matched;
}m_listener;

private:

using eprosima::fastrtps::rtps::ReaderListener::onReaderMatched;
}
m_listener;
};

#endif /* TESTREADERPERSISTENT_H_ */
31 changes: 25 additions & 6 deletions examples/C++/RTPSTest_persistent/TestWriterPersistent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,49 @@

#include <fastrtps/rtps/writer/WriterListener.h>

class TestWriterPersistent {
class TestWriterPersistent
{
public:

TestWriterPersistent();
virtual ~TestWriterPersistent();
eprosima::fastrtps::rtps::RTPSParticipant* mp_participant;
eprosima::fastrtps::rtps::RTPSWriter* mp_writer;
eprosima::fastrtps::rtps::WriterHistory* mp_history;
bool init(); //Initialize writer
bool reg(); //Register the Writer
void run(uint16_t samples); //Run the Writer
class MyListener :public eprosima::fastrtps::rtps::WriterListener
void run(
uint16_t samples); //Run the Writer
class MyListener : public eprosima::fastrtps::rtps::WriterListener
{
public:
MyListener():n_matched(0){};
~MyListener(){};

MyListener()
: n_matched(0)
{
}

~MyListener()
{
}

void onWriterMatched(
eprosima::fastrtps::rtps::RTPSWriter*,
eprosima::fastrtps::rtps::MatchingInfo& info) override
{
if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING)
{
++n_matched;
}
}

int n_matched;
}m_listener;

private:

using eprosima::fastrtps::rtps::WriterListener::onWriterMatched;
}
m_listener;
};

#endif /* TESTWRITERPERSISTENT_H_ */
31 changes: 25 additions & 6 deletions examples/C++/RTPSTest_registered/TestReaderRegistered.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
class TestReaderRegistered
{
public:

TestReaderRegistered();
virtual ~TestReaderRegistered();
eprosima::fastrtps::rtps::RTPSParticipant* mp_participant;
Expand All @@ -36,23 +37,41 @@ class TestReaderRegistered
bool init(); //Initialization
bool reg(); //Register
void run(); //Run
class MyListener:public eprosima::fastrtps::rtps::ReaderListener
class MyListener : public eprosima::fastrtps::rtps::ReaderListener
{
public:
MyListener():n_received(0),n_matched(0){};
~MyListener(){};

MyListener()
: n_received(0)
, n_matched(0)
{
}

~MyListener()
{
}

void onNewCacheChangeAdded(
eprosima::fastrtps::rtps::RTPSReader* reader,
const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
void onReaderMatched(
eprosima::fastrtps::rtps::RTPSReader*,
eprosima::fastrtps::rtps::MatchingInfo& info) override
{
if(info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) n_matched++;
};
if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING)
{
n_matched++;
}
}

uint32_t n_received;
uint32_t n_matched;
}m_listener;

private:

using eprosima::fastrtps::rtps::ReaderListener::onReaderMatched;
}
m_listener;
};

#endif /* TESTREADER_H_ */
31 changes: 25 additions & 6 deletions examples/C++/RTPSTest_registered/TestWriterRegistered.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,49 @@

#include "fastrtps/rtps/writer/WriterListener.h"

class TestWriterRegistered {
class TestWriterRegistered
{
public:

TestWriterRegistered();
virtual ~TestWriterRegistered();
eprosima::fastrtps::rtps::RTPSParticipant* mp_participant;
eprosima::fastrtps::rtps::RTPSWriter* mp_writer;
eprosima::fastrtps::rtps::WriterHistory* mp_history;
bool init(); //Initialize writer
bool reg(); //Register the Writer
void run(uint16_t samples); //Run the Writer
class MyListener :public eprosima::fastrtps::rtps::WriterListener
void run(
uint16_t samples); //Run the Writer
class MyListener : public eprosima::fastrtps::rtps::WriterListener
{
public:
MyListener():n_matched(0){};
~MyListener(){};

MyListener()
: n_matched(0)
{
}

~MyListener()
{
}

void onWriterMatched(
eprosima::fastrtps::rtps::RTPSWriter*,
eprosima::fastrtps::rtps::MatchingInfo& info) override
{
if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING)
{
++n_matched;
}
}

int n_matched;
}m_listener;

private:

using eprosima::fastrtps::rtps::WriterListener::onWriterMatched;
}
m_listener;
};

#endif /* TESTWRITER_H_ */
68 changes: 39 additions & 29 deletions examples/C++/UserDefinedTransportExample/UserDefinedTransportExampleReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,49 @@
#include <string>
#include <list>

class my_ReaderListener: public eprosima::fastrtps::rtps::ReaderListener
class my_ReaderListener : public eprosima::fastrtps::rtps::ReaderListener
{
public:
int n_received;
my_ReaderListener();
~my_ReaderListener() override;
void onNewCacheChangeAdded(
eprosima::fastrtps::rtps::RTPSReader* reader,
const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
public:

void onReaderMatched(
eprosima::fastrtps::rtps::RTPSReader* reader,
eprosima::fastrtps::rtps::MatchingInfo& info) override;
int n_received;
my_ReaderListener();
~my_ReaderListener() override;
void onNewCacheChangeAdded(
eprosima::fastrtps::rtps::RTPSReader* reader,
const eprosima::fastrtps::rtps::CacheChange_t* const change) override;

void onReaderMatched(
eprosima::fastrtps::rtps::RTPSReader* reader,
eprosima::fastrtps::rtps::MatchingInfo& info) override;

private:

using eprosima::fastrtps::rtps::ReaderListener::onReaderMatched;
};

class UserDefinedTransportExampleReader
{
private:
my_ReaderListener *my_listener;
public:
UserDefinedTransportExampleReader();
~UserDefinedTransportExampleReader();
void init();
bool isInitialized();
bool read();
private:
eprosima::fastrtps::rtps::RTPSParticipantAttributes pattr;
eprosima::fastrtps::rtps::RTPSParticipant *my_participant;
eprosima::fastrtps::rtps::ReaderAttributes rattr;
eprosima::fastrtps::rtps::RTPSReader *my_reader;
eprosima::fastrtps::rtps::HistoryAttributes hattr;
eprosima::fastrtps::ReaderQos rqos;
eprosima::fastrtps::TopicAttributes tattr;
eprosima::fastrtps::rtps::ReaderHistory *my_history;
bool initialized_;
private:

my_ReaderListener* my_listener;

public:

UserDefinedTransportExampleReader();
~UserDefinedTransportExampleReader();
void init();
bool isInitialized();
bool read();

private:

eprosima::fastrtps::rtps::RTPSParticipantAttributes pattr;
eprosima::fastrtps::rtps::RTPSParticipant* my_participant;
eprosima::fastrtps::rtps::ReaderAttributes rattr;
eprosima::fastrtps::rtps::RTPSReader* my_reader;
eprosima::fastrtps::rtps::HistoryAttributes hattr;
eprosima::fastrtps::ReaderQos rqos;
eprosima::fastrtps::TopicAttributes tattr;
eprosima::fastrtps::rtps::ReaderHistory* my_history;
bool initialized_;
};
Loading
Loading