Merge branch 'master' of ssh://sourcecode01.de.bosch.com:7999/aos/ice…

…oryx_eclipse into iox-#65-initial-implementation-cyclonedds-to-iox-gateway
eclipse-iceoryx · Jun 18, 2020 · 0fc4869 · 0fc4869
2 parents 01116fd + 176cbb8
commit 0fc4869
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port.hpp
@@ -59,9 +59,9 @@ class ReceiverPort : public BasePort
 
     // BEGIN REGION__APPLICATION // /* access from Application-------------------------------
 
-    void subscribe(const bool f_autoResubscribe = false,
-                   const uint32_t f_deliverySize = MAX_RECEIVER_QUEUE_CAPACITY); // deprecated
-    void subscribe(const uint32_t f_deliverySize = MAX_RECEIVER_QUEUE_CAPACITY);
+    virtual void subscribe(const bool f_autoResubscribe = false,
+                           const uint32_t f_deliverySize = MAX_RECEIVER_QUEUE_CAPACITY); // deprecated
+    virtual void subscribe(const uint32_t f_deliverySize = MAX_RECEIVER_QUEUE_CAPACITY);
     void unsubscribe();
     bool isSubscribed() const;
     SubscribeState getSubscribeState() const;

diff --git a/iceoryx_utils/test/moduletests/test_index_queue.cpp b/iceoryx_utils/test/moduletests/test_index_queue.cpp
@@ -69,7 +69,6 @@ TYPED_TEST(IndexQueueTest, defaultConstructedQueueIsEmpty)
 TYPED_TEST(IndexQueueTest, constructedQueueIsEmpty)
 {
     using Queue = typename TestFixture::Queue;
-    using index_t = typename TestFixture::index_t;
 
     Queue q(Queue::ConstructEmpty);
     EXPECT_TRUE(q.empty());
@@ -78,7 +77,6 @@ TYPED_TEST(IndexQueueTest, constructedQueueIsEmpty)
 
 TYPED_TEST(IndexQueueTest, queueIsNotEmptyAfterPush)
 {
-    using index_t = typename TestFixture::index_t;
     auto& q = this->queue;
     auto index = this->fullQueue.pop();
 
@@ -88,7 +86,6 @@ TYPED_TEST(IndexQueueTest, queueIsNotEmptyAfterPush)
 
 TYPED_TEST(IndexQueueTest, queueIsEmptyAgainAfterPushFollowedByPop)
 {
-    using index_t = typename TestFixture::index_t;
     auto& q = this->queue;
 
     auto index = this->fullQueue.pop();
@@ -226,4 +223,4 @@ TYPED_TEST(IndexQueueTest, popIfFullReturnsNothingWhenQueueIsNotFull)
     EXPECT_FALSE(q.popIfFull().isValid());
 }
 
-} // namespace
+} // namespace
diff --git a/iceoryx_utils/test/moduletests/test_lockfree_queue_cyclic_index.cpp b/iceoryx_utils/test/moduletests/test_lockfree_queue_cyclic_index.cpp
@@ -215,7 +215,6 @@ TYPED_TEST(LockFreeQueueCyclicIndexTest, cyclicIncrementWraparound)
 
     const auto i = Index::MAX_INDEX;
     const auto c = Index::MAX_CYCLE - 1;
-    const auto m = Index::MAX_INDEX + 1;
 
     const auto expectedIndex = 0;
     const auto expectedCycle = c + 1;
@@ -376,4 +375,4 @@ TYPED_TEST(LockFreeQueueCyclicIndexTest, isOneCycleBehindCheckDuringOverflow)
 }
 
 
-} // namespace
+} // namespace
diff --git a/iceoryx_utils/test/moduletests/test_semaphore_module.cpp b/iceoryx_utils/test/moduletests/test_semaphore_module.cpp
@@ -296,7 +296,6 @@ TEST_P(Semaphore_test, MoveCTor)
 TIMING_TEST_P(Semaphore_test, TimedWaitWithTimeout, Repeat(3), [&] {
     using namespace iox::units;
     std::atomic_bool timedWaitFinish{false};
-    bool isTestSuccessful{true};
 
     std::thread t([&] {
         auto ts = Duration::nanoseconds(TIMING_TEST_TIMEOUT).timespec(TimeSpecReference::Epoch);
@@ -321,7 +320,6 @@ TIMING_TEST_P(Semaphore_test, TimedWaitWithTimeout, Repeat(3), [&] {
 TIMING_TEST_P(Semaphore_test, TimedWaitWithoutTimeout, Repeat(3), [&] {
     using namespace iox::units;
     std::atomic_bool timedWaitFinish{false};
-    bool isTestSuccessful{true};
 
     std::thread t([&] {
         auto ts = Duration::nanoseconds(TIMING_TEST_TIMEOUT).timespec(TimeSpecReference::Epoch);