Refs #21293: Windows warnings & eofs

Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Oct 3, 2024 · b14868d · b14868d
1 parent 2574749
commit b14868d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/src/cpp/rtps/reader/LocalReaderPointer.cpp b/src/cpp/rtps/reader/LocalReaderPointer.cpp
@@ -88,4 +88,4 @@ bool LocalReaderPointer::is_valid()
 
 } // namespace rtps
 } // namespace fastdds
-} // namespace eprosima
+} // namespace eprosima
diff --git a/src/cpp/rtps/reader/LocalReaderPointer.hpp b/src/cpp/rtps/reader/LocalReaderPointer.hpp
@@ -117,4 +117,4 @@ class LocalReaderPointer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_RTPS_WRITER__LOCALREADERPOINTER_HPP
+#endif // FASTDDS_RTPS_WRITER__LOCALREADERPOINTER_HPP
diff --git a/src/cpp/rtps/reader/LocalReaderView.cpp b/src/cpp/rtps/reader/LocalReaderView.cpp
@@ -54,15 +54,15 @@ void LocalReaderView::dereference()
 }
 
 void LocalReaderView::wait_for_references_and_set_status(
-        size_t references,
+        size_t n_references,
         LocalReaderViewStatus new_status)
 {
     std::unique_lock<std::mutex> lock(mutex);
-    if (this->references.load() != references)
+    if (this->references.load() != n_references)
     {
         cv.wait(lock, [&]()
                 {
-                    return this->references.load() == references;
+                    return this->references.load() == n_references;
                 });
     }
     status = new_status;

diff --git a/src/cpp/rtps/reader/LocalReaderView.hpp b/src/cpp/rtps/reader/LocalReaderView.hpp
@@ -102,4 +102,4 @@ class LocalReaderView
 } /* namespace fastdds */
 } /* namespace eprosima */
 
-#endif // FASTDDS_RTPS_WRITER__LOCALREADERVIEW_HPP
+#endif // FASTDDS_RTPS_WRITER__LOCALREADERVIEW_HPP
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -443,8 +443,6 @@ bool StatefulWriter::intraprocess_heartbeat(
         bool liveliness)
 {
     bool returned_value = false;
-
-    std::lock_guard<RecursiveTimedMutex> guardW(mp_mutex);
     LocalReaderPointer local_reader_pt = reader_proxy->local_reader();
 
     if (local_reader_pt.is_valid())

diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
@@ -974,10 +974,10 @@ TEST(DDSBasic, successful_destruction_among_intraprocess_participants)
             ASSERT_TRUE(reception_participants.back()->init_publisher(0u));
         }
 
-        participant_1->wait_discovery(std::chrono::seconds::zero(), num_reception_participants, true);
+        participant_1->wait_discovery(std::chrono::seconds::zero(), (uint8_t)num_reception_participants, true);
 
-        participant_1->pub_wait_discovery(num_reception_participants);
-        participant_1->sub_wait_discovery(num_reception_participants);
+        participant_1->pub_wait_discovery((uint8_t)num_reception_participants);
+        participant_1->sub_wait_discovery((uint8_t)num_reception_participants);
 
         auto data_12 = default_helloworld_data_generator();