From faaba2c9b47cd795fbde54c2f1669502a73840c1 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Thu, 14 Aug 2014 14:01:02 -0400 Subject: [PATCH] client: silence false-postive warnings These structs are being default initialized. Change-Id: I2e38bf62bc97d6140f49a4a0184d900d0e5f0c8a Refs: #48032 --- daemon/bin/dbus/dbusclient.cpp | 12 ++++++------ daemon/src/client/callmanager.h | 2 ++ daemon/src/client/configurationmanager.h | 2 ++ daemon/src/client/presencemanager.h | 4 +++- daemon/src/client/videomanager.h | 2 ++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/daemon/bin/dbus/dbusclient.cpp b/daemon/bin/dbus/dbusclient.cpp index 2ec27fccb2..a1e885d568 100644 --- a/daemon/bin/dbus/dbusclient.cpp +++ b/daemon/bin/dbus/dbusclient.cpp @@ -209,18 +209,18 @@ int DBusClient::initLibrary(int sflphFlags) #endif // SFL_VIDEO // All event handlers - sflph_ev_handlers evHandlers = {}; - - evHandlers.call_ev_handlers = callEvHandlers; - evHandlers.config_ev_handlers = configEvHandlers; + sflph_ev_handlers evHandlers = { + .call_ev_handlers = callEvHandlers, + .config_ev_handlers = configEvHandlers, #ifdef SFL_PRESENCE - evHandlers.pres_ev_handlers = presEvHandlers; + .pres_ev_handlers = presEvHandlers, #endif // SFL_PRESENCE #ifdef SFL_VIDEO - evHandlers.video_ev_handlers = videoEvHandlers; + .video_ev_handlers = videoEvHandlers #endif // SFL_VIDEO + }; // Initialize now return sflph_init(&evHandlers, static_cast<sflph_init_flag>(sflphFlags)); diff --git a/daemon/src/client/callmanager.h b/daemon/src/client/callmanager.h index 17826347f4..517fae543b 100644 --- a/daemon/src/client/callmanager.h +++ b/daemon/src/client/callmanager.h @@ -161,8 +161,10 @@ class CallManager #endif private: +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" // Event handlers; needed by the library API sflph_call_ev_handlers evHandlers_{}; +#pragma GCC diagnostic warning "-Wmissing-field-initializers" }; #endif//CALLMANAGER_H diff --git a/daemon/src/client/configurationmanager.h b/daemon/src/client/configurationmanager.h index c2d36ee976..b49f1a9dde 100644 --- a/daemon/src/client/configurationmanager.h +++ b/daemon/src/client/configurationmanager.h @@ -160,8 +160,10 @@ class ConfigurationManager std::vector< int32_t > getHardwareAudioFormat(); private: +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" // Event handlers; needed by the library API sflph_config_ev_handlers evHandlers_{}; +#pragma GCC diagnostic warning "-Wmissing-field-initializers" }; #endif //CONFIGURATIONMANAGER_H diff --git a/daemon/src/client/presencemanager.h b/daemon/src/client/presencemanager.h index 9dc96ba887..b5282626c5 100644 --- a/daemon/src/client/presencemanager.h +++ b/daemon/src/client/presencemanager.h @@ -64,8 +64,10 @@ class PresenceManager const bool& state); private: +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" // Event handlers; needed by the library API - struct sflph_pres_ev_handlers evHandlers_{}; + sflph_pres_ev_handlers evHandlers_{}; +#pragma GCC diagnostic warning "-Wmissing-field-initializers" }; #endif //PRESENCEINT_H diff --git a/daemon/src/client/videomanager.h b/daemon/src/client/videomanager.h index c02bc36267..e83c374ca2 100644 --- a/daemon/src/client/videomanager.h +++ b/daemon/src/client/videomanager.h @@ -110,7 +110,9 @@ class VideoManager void stoppedDecoding(const std::string &id, const std::string& shmPath, bool isMixer); private: +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" sflph_video_ev_handlers evHandlers_{}; +#pragma GCC diagnostic warning "-Wmissing-field-initializers" }; #endif // VIDEOMANAGER_H_ -- GitLab