[clang] Fix compilation

Author: JIMENEZ Cédric

src/chargepoint/main.cpp

@@ -42,7 +42,7 @@ class Listener : public IMqttClient::IListener
 {
   public:
     /** @copydoc void IMqttClient::IListener::mqttConnectionLost() */
-    void mqttConnectionLost()
+    void mqttConnectionLost() override
     {
         cout << "Communication lost!" << endl;
         client->close();

src/launcher/CommandHandler.cpp

@@ -33,8 +33,8 @@ SOFTWARE.
 #include <sstream>
 
 /** @brief Constructor */
-CommandHandler::CommandHandler(IMqttClient& client, const std::string broker_url, std::filesystem::path chargepoints_dir)
-    : m_client(client), m_broker_url(broker_url), m_chargepoints_dir(chargepoints_dir), m_end(false), m_cp_status(), m_cp_pids()
+CommandHandler::CommandHandler(const std::string broker_url, std::filesystem::path chargepoints_dir)
+    : m_broker_url(broker_url), m_chargepoints_dir(chargepoints_dir), m_end(false), m_cp_status(), m_cp_pids()
 {
 }
 

src/launcher/CommandHandler.h

@@ -36,7 +36,7 @@ class CommandHandler : public IMqttClient::IListener
 {
   public:
     /** @brief Constructor */
-    CommandHandler(IMqttClient& client, const std::string broker_url, std::filesystem::path chargepoints_dir);
+    CommandHandler(const std::string broker_url, std::filesystem::path chargepoints_dir);
 
     /** @brief Destructor */
     virtual ~CommandHandler();
@@ -57,8 +57,6 @@ class CommandHandler : public IMqttClient::IListener
     bool killChargePoints(const rapidjson::Value& charge_points);
 
   private:
-    /** @brief MQTT client */
-    IMqttClient& m_client;
     /** @brief URL of the broker */
     const std::string m_broker_url;
     /** @brief Directory to store charge points data */

src/launcher/main.cpp

@@ -124,7 +124,7 @@ int main(int argc, char* argv[])
     IMqttClient* mqtt = IMqttClient::create("OCPP charge point simulator launcher");
 
     // Command handler
-    CommandHandler cmd_handler(*mqtt, broker_url, chargepoint_dir);
+    CommandHandler cmd_handler(broker_url, chargepoint_dir);
     mqtt->registerListener(cmd_handler);
 
     // Configuration file

src/mqtt_client/private/PahoMqttClient.cpp

@@ -86,10 +86,17 @@ bool PahoMqttClient::connect(const std::string& url, bool clean_session, std::ch
         if (MQTTClient_create(&m_client, url.c_str(), m_id.c_str(), MQTTCLIENT_PERSISTENCE_NONE, nullptr) == MQTTCLIENT_SUCCESS)
         {
             // Connect to the broker
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif // __clang
             MQTTClient_connectOptions options = MQTTClient_connectOptions_initializer;
-            options.cleansession              = static_cast<int>(clean_session);
-            options.connectTimeout            = static_cast<int>(timeout.count());
-            options.keepAliveInterval         = static_cast<int>(keep_alive.count());
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang
+            options.cleansession      = static_cast<int>(clean_session);
+            options.connectTimeout    = static_cast<int>(timeout.count());
+            options.keepAliveInterval = static_cast<int>(keep_alive.count());
             if (m_will.topicName)
             {
                 options.will = &m_will;
@@ -247,4 +254,4 @@ int PahoMqttClient::onMessageReceived(void* context, char* topic, int topic_len,
     MQTTClient_freeMessage(&message);
 
     return 1;
-}
+}