Fix hidden overloaded virtual methods (#4516)

* Refs #20592: Fix for test Signed-off-by: EduPonz <[email protected]> * Refs #20592: Fix for examples Signed-off-by: EduPonz <[email protected]> * Refs #20592: Add more warning flags to Ubuntu CI Signed-off-by: EduPonz <[email protected]> * Refs #20592: Remove default values on overloaded PDPClient::announceParticipantState Signed-off-by: EduPonz <[email protected]> --------- Signed-off-by: EduPonz <[email protected]> (cherry picked from commit 63cc242) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml # examples/C++/RTPSTest_persistent/TestReaderPersistent.h # examples/C++/RTPSTest_persistent/TestWriterPersistent.h # examples/C++/RTPSTest_registered/TestReaderRegistered.h # examples/C++/RTPSTest_registered/TestWriterRegistered.h # examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h # src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp # test/blackbox/common/DDSBlackboxTestsBasic.cpp # test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp # test/blackbox/common/DDSBlackboxTestsDiscovery.cpp # test/blackbox/common/DDSBlackboxTestsFindTopic.cpp # test/dds/communication/SubscriberDynamic.cpp # test/dds/communication/security/PublisherModule.hpp # test/dds/communication/security/SubscriberModule.hpp # test/unittest/dds/participant/ParticipantTests.cpp # test/unittest/dds/subscriber/DataReaderHistoryTests.cpp # test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp
eProsima · Mar 20, 2024 · 5156cac · 5156cac
1 parent d4f57b0
commit 5156cac
Show file tree

Hide file tree

Showing 41 changed files with 3,400 additions and 2 deletions.
diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -97,7 +97,11 @@ jobs:
           colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           cmake_args: ${{ inputs.cmake-args }}
+<<<<<<< HEAD
           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
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516))
           cmake_build_type: ${{ matrix.cmake-build-type }}
           workspace: ${{ github.workspace }}
 

diff --git a/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationPublisher.h b/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationPublisher.h
@@ -118,6 +118,8 @@ class HelloWorldPublisher
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+
         //! Number of DataReaders matched to the associated DataWriter
         std::atomic<std::uint32_t> matched_;
 

diff --git a/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.h b/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.h
@@ -107,6 +107,8 @@ class HelloWorldSubscriber
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+
         HelloWorld hello_;
 
         //! Number of DataWriters matched to the associated DataReader

diff --git a/examples/C++/DDS/LivelinessQoS/LivelinessSubscriber.h b/examples/C++/DDS/LivelinessQoS/LivelinessSubscriber.h
@@ -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_;

diff --git a/examples/C++/RTPSTest_persistent/TestReaderPersistent.h b/examples/C++/RTPSTest_persistent/TestReaderPersistent.h
@@ -52,7 +52,16 @@ class TestReaderPersistent
         };
         uint32_t n_received;
         uint32_t n_matched;
+<<<<<<< HEAD:examples/C++/RTPSTest_persistent/TestReaderPersistent.h
     }m_listener;
+=======
+
+    private:
+
+        using eprosima::fastrtps::rtps::ReaderListener::onReaderMatched;
+    }
+    m_listener;
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516)):examples/cpp/rtps/Persistent/TestReaderPersistent.h
 };
 
 #endif /* TESTREADERPERSISTENT_H_ */
diff --git a/examples/C++/RTPSTest_persistent/TestWriterPersistent.h b/examples/C++/RTPSTest_persistent/TestWriterPersistent.h
@@ -48,7 +48,16 @@ class TestWriterPersistent {
                 ++n_matched;
         }
         int n_matched;
+<<<<<<< HEAD:examples/C++/RTPSTest_persistent/TestWriterPersistent.h
     }m_listener;
+=======
+
+    private:
+
+        using eprosima::fastrtps::rtps::WriterListener::onWriterMatched;
+    }
+    m_listener;
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516)):examples/cpp/rtps/Persistent/TestWriterPersistent.h
 };
 
 #endif /* TESTWRITERPERSISTENT_H_ */
diff --git a/examples/C++/RTPSTest_registered/TestReaderRegistered.h b/examples/C++/RTPSTest_registered/TestReaderRegistered.h
@@ -52,7 +52,16 @@ class TestReaderRegistered
         };
         uint32_t n_received;
         uint32_t n_matched;
+<<<<<<< HEAD:examples/C++/RTPSTest_registered/TestReaderRegistered.h
     }m_listener;
+=======
+
+    private:
+
+        using eprosima::fastrtps::rtps::ReaderListener::onReaderMatched;
+    }
+    m_listener;
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516)):examples/cpp/rtps/Registered/TestReaderRegistered.h
 };
 
 #endif /* TESTREADER_H_ */
diff --git a/examples/C++/RTPSTest_registered/TestWriterRegistered.h b/examples/C++/RTPSTest_registered/TestWriterRegistered.h
@@ -48,7 +48,16 @@ class TestWriterRegistered {
                 ++n_matched;
         }
         int n_matched;
+<<<<<<< HEAD:examples/C++/RTPSTest_registered/TestWriterRegistered.h
     }m_listener;
+=======
+
+    private:
+
+        using eprosima::fastrtps::rtps::WriterListener::onWriterMatched;
+    }
+    m_listener;
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516)):examples/cpp/rtps/Registered/TestWriterRegistered.h
 };
 
 #endif /* TESTWRITER_H_ */
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h
@@ -0,0 +1,106 @@
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file DiscoveryServerServer.h
+ *
+ */
+
+#ifndef _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_DISCOVERYSERVERSERVER_H_
+#define _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_DISCOVERYSERVERSERVER_H_
+
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+
+#include <fastdds/dds/domain/DomainParticipant.hpp>
+#include <fastdds/dds/domain/DomainParticipantListener.hpp>
+
+#include "common.h"
+
+/**
+ * Class with a partipant configured to function as server in the Discovery Server mechanism
+ */
+class DiscoveryServer
+{
+public:
+
+    DiscoveryServer();
+
+    virtual ~DiscoveryServer();
+
+    //! Initialize the server
+    bool init(
+            const std::string& server_address,
+            unsigned short server_port,
+            unsigned short server_id,
+            TransportKind transport,
+            bool has_connection_server,
+            const std::string& connection_server_address,
+            unsigned short connection_server_port,
+            unsigned short connection_server_id);
+
+    //! Run
+    void run(
+            unsigned int timeout);
+
+    //! Return the current state of execution
+    static bool is_stopped();
+
+    //! Trigger the end of execution
+    static void stop();
+
+private:
+
+    eprosima::fastdds::dds::DomainParticipant* participant_;
+
+    /**
+     * Class handling discovery events
+     */
+    class ServerListener : public eprosima::fastdds::dds::DomainParticipantListener
+    {
+    public:
+
+        ServerListener()
+        {
+        }
+
+        ~ServerListener() override
+        {
+        }
+
+        //! Callback executed when a DomainParticipant is discovered, dropped or removed
+        void on_participant_discovery(
+                eprosima::fastdds::dds::DomainParticipant* /*participant*/,
+                eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;
+
+    private:
+
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+    }
+    listener_;
+
+    //! Member used for control flow purposes
+    static std::atomic<bool> stop_;
+
+    //! Protects terminate condition variable
+    static std::mutex terminate_cv_mtx_;
+
+    //! Waits during execution until SIGINT or max_messages_ samples are received
+    static std::condition_variable terminate_cv_;
+};
+
+
+
+#endif /* _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_DISCOVERYSERVERSERVER_H_ */
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h
@@ -109,8 +109,8 @@ class PDPClient : public PDP
      */
     void announceParticipantState(
             bool new_change,
-            bool dispose = false,
-            WriteParams& wparams = WriteParams::WRITE_PARAM_DEFAULT) override;
+            bool dispose,
+            WriteParams& wparams) override;
 
     /**
      * These methods wouldn't be needed under perfect server operation

diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
@@ -90,8 +90,15 @@ bool DSClientEvent::event()
         // This marks to announceParticipantState that the announcement is only meant for missing servers,
         // so it is not a periodic announcement
         mp_PDP->_serverPing = true;
+<<<<<<< HEAD
         mp_PDP->announceParticipantState(false);
         logInfo(CLIENT_PDP_THREAD, "Client " << mp_PDP->getRTPSParticipant()->getGuid() << " PDP announcement");
+=======
+        WriteParams __wp = WriteParams::write_params_default();
+        mp_PDP->announceParticipantState(false, false, __wp);
+        EPROSIMA_LOG_INFO(CLIENT_PDP_THREAD,
+                "Client " << mp_PDP->getRTPSParticipant()->getGuid() << " PDP announcement");
+>>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516))
     }
 
     return restart;

diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -192,6 +192,8 @@ class PubSubParticipant
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+
         ParticipantListener& operator =(
                 const ParticipantListener&) = delete;
         PubSubParticipant* participant_;

diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -139,6 +139,9 @@ class PubSubReader
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
+
         ParticipantListener& operator =(
                 const ParticipantListener&) = delete;
         PubSubReader& reader_;

diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -153,6 +153,10 @@ class PubSubWriter
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_subscriber_discovery;
+
         ParticipantListener& operator =(
                 const ParticipantListener&) = delete;
 

diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
@@ -168,6 +168,10 @@ class PubSubWriterReader
 
     private:
 
+        using eprosima::fastdds::dds::DomainParticipantListener::on_participant_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_publisher_discovery;
+        using eprosima::fastdds::dds::DomainParticipantListener::on_subscriber_discovery;
+
         //! Mutex guarding all info collections
         mutable std::mutex info_mutex_;
         //! The discovered participants excluding the participant this listener is listening to