From e3eb5991201273802ad4115b47f20be79365d64f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 23 Mar 2023 13:27:39 +0100 Subject: [PATCH] Fix compiler warnings by re-ordering member init in constructors --- lib/base/workqueue.cpp | 2 +- lib/icingadb/redisconnection.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index 0b1214baf..711f05124 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -16,7 +16,7 @@ boost::thread_specific_ptr l_ThreadWorkQueue; WorkQueue::WorkQueue(size_t maxItems, int threadCount, LogSeverity statsLogLevel) : m_ID(m_NextID++), m_ThreadCount(threadCount), m_MaxItems(maxItems), - m_TaskStats(15 * 60), m_StatsLogLevel(statsLogLevel) + m_StatsLogLevel(statsLogLevel), m_TaskStats(15 * 60) { /* Initialize logger. */ m_StatusTimerTimeout = Utility::GetTime(); diff --git a/lib/icingadb/redisconnection.cpp b/lib/icingadb/redisconnection.cpp index c1f73f5a0..468c839a9 100644 --- a/lib/icingadb/redisconnection.cpp +++ b/lib/icingadb/redisconnection.cpp @@ -41,11 +41,11 @@ RedisConnection::RedisConnection(const String& host, int port, const String& pat RedisConnection::RedisConnection(boost::asio::io_context& io, String host, int port, String path, String username, String password, int db, bool useTls, bool insecure, String certPath, String keyPath, String caPath, String crlPath, String tlsProtocolmin, String cipherList, double connectTimeout, DebugInfo di, const RedisConnection::Ptr& parent) - : m_Host(std::move(host)), m_Port(port), m_Path(std::move(path)), m_Username(std::move(username)), m_Password(std::move(password)), + : m_Path(std::move(path)), m_Host(std::move(host)), m_Port(port), m_Username(std::move(username)), m_Password(std::move(password)), m_DbIndex(db), m_CertPath(std::move(certPath)), m_KeyPath(std::move(keyPath)), m_Insecure(insecure), m_CaPath(std::move(caPath)), m_CrlPath(std::move(crlPath)), m_TlsProtocolmin(std::move(tlsProtocolmin)), - m_CipherList(std::move(cipherList)), m_ConnectTimeout(connectTimeout), m_DebugInfo(std::move(di)), m_Connecting(false), m_Connected(false), - m_Started(false), m_Strand(io), m_QueuedWrites(io), m_QueuedReads(io), m_LogStatsTimer(io), m_Parent(parent) + m_CipherList(std::move(cipherList)), m_ConnectTimeout(connectTimeout), m_DebugInfo(std::move(di)), m_Strand(io), + m_Connecting(false), m_Connected(false), m_Started(false), m_QueuedWrites(io), m_QueuedReads(io), m_LogStatsTimer(io), m_Parent(parent) { if (useTls && m_Path.IsEmpty()) { UpdateTLSContext();