From 7b63c58d47abe6072d229e71d40ac74a656b9fe7 Mon Sep 17 00:00:00 2001 From: Florian Reimold <11774314+FlorianReimold@users.noreply.github.com> Date: Mon, 3 Jul 2023 18:00:24 +0200 Subject: [PATCH] Fixed a couple compile warnings --- ecal/core/src/service/ecal_service_client_impl.cpp | 2 +- ecal/service/src/client_manager.cpp | 2 -- ecal/service/src/condition_variable_signaler.h | 4 ++-- ecal/service/src/protocol_v0.cpp | 4 ++-- ecal/service/src/protocol_v1.cpp | 4 ++-- ecal/service/src/server_manager.cpp | 2 -- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ecal/core/src/service/ecal_service_client_impl.cpp b/ecal/core/src/service/ecal_service_client_impl.cpp index 04f8dcc14e..457187fdd0 100644 --- a/ecal/core/src/service/ecal_service_client_impl.cpp +++ b/ecal/core/src/service/ecal_service_client_impl.cpp @@ -737,7 +737,7 @@ namespace eCAL // Event callback // TODO: Make an actual implementation const eCAL::service::ClientSession::EventCallbackT event_callback - = [this, service_ = iter] // TODO: using the this pointer here is extremely unsafe, as it actually forces us to manage the lifetime of this object + = [/*this, service_ = iter*/] // TODO: using the this pointer here is extremely unsafe, as it actually forces us to manage the lifetime of this object (eCAL::service::ClientEventType /*event*/, const std::string& /*message*/) -> void { diff --git a/ecal/service/src/client_manager.cpp b/ecal/service/src/client_manager.cpp index b9140dc48e..6a88ee87ae 100644 --- a/ecal/service/src/client_manager.cpp +++ b/ecal/service/src/client_manager.cpp @@ -17,8 +17,6 @@ * ========================= eCAL LICENSE ================================= */ -#pragma once - #include namespace eCAL diff --git a/ecal/service/src/condition_variable_signaler.h b/ecal/service/src/condition_variable_signaler.h index 42b2ac0027..ab83644636 100644 --- a/ecal/service/src/condition_variable_signaler.h +++ b/ecal/service/src/condition_variable_signaler.h @@ -27,8 +27,8 @@ class ConditionVariableSignaler { public: ConditionVariableSignaler(std::condition_variable& condition_variable, std::mutex& mutex, bool& is_signaled) - : condition_variable_(condition_variable) - , mutex_ (mutex) + : mutex_ (mutex) + , condition_variable_(condition_variable) , is_signaled_ (is_signaled) {} diff --git a/ecal/service/src/protocol_v0.cpp b/ecal/service/src/protocol_v0.cpp index 3bd9e97632..b6f0da5f6c 100644 --- a/ecal/service/src/protocol_v0.cpp +++ b/ecal/service/src/protocol_v0.cpp @@ -76,7 +76,7 @@ namespace eCAL asio::async_read(socket , asio::buffer(const_cast(payload_buffer->data()), payload_buffer->size()) , asio::transfer_at_least(payload_buffer->size()) - , [&socket, header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_read*/) + , [header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_read*/) { if (ec) { @@ -102,7 +102,7 @@ namespace eCAL asio::async_write(socket , buffer_list - , [&socket, header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_sent*/) + , [header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_sent*/) { if (ec) { diff --git a/ecal/service/src/protocol_v1.cpp b/ecal/service/src/protocol_v1.cpp index adc890c2b8..00e2645f92 100644 --- a/ecal/service/src/protocol_v1.cpp +++ b/ecal/service/src/protocol_v1.cpp @@ -139,7 +139,7 @@ namespace eCAL asio::async_read(socket , asio::buffer(const_cast(payload_buffer->data()), payload_buffer->size()) , asio::transfer_at_least(payload_buffer->size()) - , [&socket, header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_read*/) + , [header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_read*/) { if (ec) { @@ -165,7 +165,7 @@ namespace eCAL asio::async_write(socket , buffer_list - , [&socket, header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_sent*/) + , [header_buffer, payload_buffer, error_cb, success_cb](asio::error_code ec, std::size_t /*bytes_sent*/) { if (ec) { diff --git a/ecal/service/src/server_manager.cpp b/ecal/service/src/server_manager.cpp index c220fb4643..e891ca149e 100644 --- a/ecal/service/src/server_manager.cpp +++ b/ecal/service/src/server_manager.cpp @@ -17,8 +17,6 @@ * ========================= eCAL LICENSE ================================= */ -#pragma once - #include namespace eCAL