From a47c1d1b07c2c4ef479c383f3aef26ec0fca3bd7 Mon Sep 17 00:00:00 2001 From: Anar Manafov Date: Tue, 2 Jan 2024 14:27:37 +0100 Subject: [PATCH] Fix compilation errors on gcc13 --- dds-protocol-lib/src/BaseChannelImpl.h | 4 ++-- dds-protocol-lib/src/BaseSMChannelImpl.h | 6 +++--- dds-protocol-lib/src/ClientChannelImpl.h | 6 +++--- dds-protocol-lib/src/ServerChannelImpl.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dds-protocol-lib/src/BaseChannelImpl.h b/dds-protocol-lib/src/BaseChannelImpl.h index 91cdb1d7..938b33dc 100644 --- a/dds-protocol-lib/src/BaseChannelImpl.h +++ b/dds-protocol-lib/src/BaseChannelImpl.h @@ -237,7 +237,7 @@ namespace dds DDS_DECLARE_EVENT_HANDLER_CLASS(CChannelMessageHandlersImpl) protected: - CBaseChannelImpl(boost::asio::io_context& _service, uint64_t _protocolHeaderID) + CBaseChannelImpl(boost::asio::io_context& _service, uint64_t _protocolHeaderID) : CChannelEventHandlersImpl() , CChannelMessageHandlersImpl() , m_isHandshakeOK(false) @@ -265,7 +265,7 @@ namespace dds } public: - ~CBaseChannelImpl() + ~CBaseChannelImpl() { LOG(dds::misc::info) << "Channel " << gChannelTypeName[m_channelType] << " destructor is called"; stop(); diff --git a/dds-protocol-lib/src/BaseSMChannelImpl.h b/dds-protocol-lib/src/BaseSMChannelImpl.h index 21780a46..8d621306 100644 --- a/dds-protocol-lib/src/BaseSMChannelImpl.h +++ b/dds-protocol-lib/src/BaseSMChannelImpl.h @@ -194,7 +194,7 @@ namespace dds DDS_DECLARE_EVENT_HANDLER_CLASS(CChannelMessageHandlersImpl) protected: - CBaseSMChannelImpl(boost::asio::io_context& _service, + CBaseSMChannelImpl(boost::asio::io_context& _service, const std::string& _inputName, const std::string& _outputName, uint64_t _protocolHeaderID, @@ -209,7 +209,7 @@ namespace dds defaultInit({ _inputName }, _outputName, _inputOpenType, _outputOpenType); } - CBaseSMChannelImpl(boost::asio::io_context& _service, + CBaseSMChannelImpl(boost::asio::io_context& _service, const std::vector& _inputNames, const std::string& _outputName, uint64_t _protocolHeaderID, @@ -250,7 +250,7 @@ namespace dds } public: - ~CBaseSMChannelImpl() + ~CBaseSMChannelImpl() { LOG(dds::misc::info) << "SM: channel destructor is called. MQ: " << getName(); stop(); diff --git a/dds-protocol-lib/src/ClientChannelImpl.h b/dds-protocol-lib/src/ClientChannelImpl.h index c1e7985f..2f1d1700 100644 --- a/dds-protocol-lib/src/ClientChannelImpl.h +++ b/dds-protocol-lib/src/ClientChannelImpl.h @@ -20,7 +20,7 @@ namespace dds class CClientChannelImpl : public CBaseChannelImpl { protected: - CClientChannelImpl(boost::asio::io_context& _service, + CClientChannelImpl(boost::asio::io_context& _service, EChannelType _channelType, uint64_t _protocolHeaderID) : CBaseChannelImpl(_service, _protocolHeaderID) @@ -31,7 +31,7 @@ namespace dds [this](const SSenderInfo& _sender, SCommandAttachmentImpl::ptr_t /*_attachment*/) { - LOG(dds::misc::info) << "Successfull handshake"; + LOG(dds::misc::info) << "Successful handshake"; this->m_isHandshakeOK = true; @@ -60,7 +60,7 @@ namespace dds }); } - ~CClientChannelImpl() + ~CClientChannelImpl() { } diff --git a/dds-protocol-lib/src/ServerChannelImpl.h b/dds-protocol-lib/src/ServerChannelImpl.h index 539b8251..1bc89be6 100644 --- a/dds-protocol-lib/src/ServerChannelImpl.h +++ b/dds-protocol-lib/src/ServerChannelImpl.h @@ -18,7 +18,7 @@ namespace dds class CServerChannelImpl : public CBaseChannelImpl { protected: - CServerChannelImpl(boost::asio::io_context& _service, const channelTypeVector_t _requiredChannelTypes) + CServerChannelImpl(boost::asio::io_context& _service, const channelTypeVector_t _requiredChannelTypes) : CBaseChannelImpl(_service, 0) , m_requiredChannelTypes(_requiredChannelTypes) { @@ -81,7 +81,7 @@ namespace dds // }); } - ~CServerChannelImpl() + ~CServerChannelImpl() { }