diff --git a/daemon/src/client/callmanager.cpp b/daemon/src/client/callmanager.cpp index c1c8b8e02ff0530b3e43e3d28b03697ffdc7a388..472f2edd97b57b84bfbd72423dc262c8fbf90023 100644 --- a/daemon/src/client/callmanager.cpp +++ b/daemon/src/client/callmanager.cpp @@ -48,7 +48,7 @@ CallManager::CallManager() { - std::memset(std::addressof(evHandlers_), 0, sizeof(evHandlers_)); + evHandlers_ = {}; } void CallManager::registerEvHandlers(struct sflph_call_ev_handlers* evHandlers) diff --git a/daemon/src/client/configurationmanager.cpp b/daemon/src/client/configurationmanager.cpp index 17c77907ded32877f8d142f8eff74c975e89bf66..bd22b5bbdc54c8e1d3aa7d7955006d8be79016c9 100644 --- a/daemon/src/client/configurationmanager.cpp +++ b/daemon/src/client/configurationmanager.cpp @@ -53,7 +53,7 @@ ConfigurationManager::ConfigurationManager() { - std::memset(std::addressof(evHandlers_), 0, sizeof(evHandlers_)); + evHandlers_ = {}; } void ConfigurationManager::registerEvHandlers(struct sflph_config_ev_handlers* evHandlers) diff --git a/daemon/src/client/presencemanager.cpp b/daemon/src/client/presencemanager.cpp index 1defbc60f53a89437545cc4d7d403f6874cc0025..201c29143fa55ac699158f22dc924988b40a7c46 100644 --- a/daemon/src/client/presencemanager.cpp +++ b/daemon/src/client/presencemanager.cpp @@ -51,7 +51,7 @@ constexpr static const char* OFFLINE_KEY = "Offline"; PresenceManager::PresenceManager() { - std::memset(std::addressof(evHandlers_), 0, sizeof(evHandlers_)); + evHandlers_ = {}; } void PresenceManager::registerEvHandlers(struct sflph_pres_ev_handlers* evHandlers) diff --git a/daemon/src/client/videomanager.cpp b/daemon/src/client/videomanager.cpp index 106cccdf7fb780755d12627d596bed2baea4da89..237a3b45d88a695ad2ed8eec7f873afb000f1b6e 100644 --- a/daemon/src/client/videomanager.cpp +++ b/daemon/src/client/videomanager.cpp @@ -40,7 +40,7 @@ VideoManager::VideoManager() { - std::memset(std::addressof(evHandlers_), 0, sizeof(evHandlers_)); + evHandlers_ = {}; libav_utils::sfl_avcodec_init(); } diff --git a/daemon/src/sflphone_api.cpp b/daemon/src/sflphone_api.cpp index f4d0446dfb2f39f40136b2d7518437a052fc200a..41d63ccc181080402cb08c01029672a52658a50a 100644 --- a/daemon/src/sflphone_api.cpp +++ b/daemon/src/sflphone_api.cpp @@ -105,7 +105,7 @@ int sflph_init(struct sflph_ev_handlers* ev_handlers, enum sflph_init_flag flags // Create manager try { - _manager = std::addressof(Manager::instance()); + _manager = &(Manager::instance()); } catch (...) { return -SFLPH_ERR_MANAGER_INIT; }