From e8bd71e6fdb1625824484386da760b545a1aa3a0 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Sat, 4 Jul 2015 11:46:49 +0900 Subject: [PATCH] Fix setting callback to use move operation in PrsenceSubscriber It was copying callback which is unneccesary overhead. Change-Id: Ic867a1e68225a95b2537737c9290ec0d3fe6354c Signed-off-by: coderhyme Reviewed-on: https://gerrit.iotivity.org/gerrit/1516 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka Reviewed-by: Uze Choi Tested-by: Uze Choi --- .../modules/common/primitiveResource/src/PresenceSubscriber.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp b/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp index 2b35cb6..a3284e7 100644 --- a/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp +++ b/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp @@ -36,7 +36,7 @@ namespace OIC const std::string&, OCConnectivityType, SubscribeCallback); invokeOCFunc(static_cast(OC::OCPlatform::subscribePresence), - handle, host, connectivityType, presenceHandler); + handle, host, connectivityType, std::move(presenceHandler)); } void subscribePresence(OCDoHandle& handle, const std::string& host, @@ -47,7 +47,7 @@ namespace OIC const std::string&, const std::string&, OCConnectivityType, SubscribeCallback); invokeOCFunc(static_cast(OC::OCPlatform::subscribePresence), - handle, host, resourceType, connectivityType, presenceHandler); + handle, host, resourceType, connectivityType, std::move(presenceHandler)); } void unsubscribePresence(OCDoHandle handle) @@ -71,7 +71,7 @@ namespace OIC OCConnectivityType connectivityType, SubscribeCallback presenceHandler) : m_handle{ nullptr } { - subscribePresence(m_handle, host, connectivityType, presenceHandler); + subscribePresence(m_handle, host, connectivityType, std::move(presenceHandler)); } PresenceSubscriber::PresenceSubscriber(const std::string& host, @@ -79,7 +79,8 @@ namespace OIC SubscribeCallback presenceHandler) : m_handle{ nullptr } { - subscribePresence(m_handle, host, resourceType, connectivityType, presenceHandler); + subscribePresence(m_handle, host, resourceType, connectivityType, + std::move(presenceHandler)); } PresenceSubscriber::~PresenceSubscriber() -- 2.7.4