Fix rebase

Signed-off-by: jparisu <javierparis@eprosima.com>
eProsima · Jun 13, 2023 · bb8be3a · bb8be3a
1 parent 39bf219
commit bb8be3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/fastdds/rtps/builtin/discovery/participant/PDP.h b/include/fastdds/rtps/builtin/discovery/participant/PDP.h
@@ -146,7 +146,7 @@ class PDP
      */
     virtual void announceParticipantState(
             bool new_change,
-            bool dispose = false) = 0;
+            bool dispose = false);
 
     //!Stop the RTPSParticipantAnnouncement (only used in tests).
     virtual void stopParticipantAnnouncement();

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -449,8 +449,6 @@ bool PDP::enable()
 }
 
 void PDP::announceParticipantState(
-        RTPSWriter& writer,
-        WriterHistory& history,
         bool new_change,
         bool dispose /* = false */)
 {
@@ -459,6 +457,8 @@ void PDP::announceParticipantState(
 }
 
 void PDP::announceParticipantState(
+        RTPSWriter& writer,
+        WriterHistory& history,
         bool new_change,
         bool dispose,
         WriteParams& wparams)