From 9f3cc70d70f8887839db89bdec3bb355a16d373c Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 6 Aug 2014 16:41:35 -0400
Subject: [PATCH] daemon: remove redundant std::addressof use
---
daemon/src/client/callmanager.cpp | 2 +-
daemon/src/client/configurationmanager.cpp | 2 +-
daemon/src/client/presencemanager.cpp | 2 +-
daemon/src/client/videomanager.cpp | 2 +-
daemon/src/sflphone_api.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/daemon/src/client/callmanager.cpp b/daemon/src/client/callmanager.cpp
index c1c8b8e02f..472f2edd97 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 17c77907de..bd22b5bbdc 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 1defbc60f5..201c29143f 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 106cccdf7f..237a3b45d8 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 f4d0446dfb..41d63ccc18 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;
}
--
GitLab