From ece28d920b1469301fccfdb1fdaa091e90101365 Mon Sep 17 00:00:00 2001 From: "jyong2.kim" Date: Fri, 31 Jul 2015 13:26:24 +0900 Subject: [PATCH] [Resource Encapsulation]Clean up code on ResourceCache. fix typing error. Change-Id: I081f149e6fa38890afc8982655f0bdfcf1caac58 Signed-off-by: jyong2.kim Reviewed-on: https://gerrit.iotivity.org/gerrit/2015 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji Tested-by: Habib Virji --- .../src/resourceCache/src/DataCache.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/service/resource-encapsulation/src/resourceCache/src/DataCache.cpp b/service/resource-encapsulation/src/resourceCache/src/DataCache.cpp index ce91ebe..a6b5874 100644 --- a/service/resource-encapsulation/src/resourceCache/src/DataCache.cpp +++ b/service/resource-encapsulation/src/resourceCache/src/DataCache.cpp @@ -39,7 +39,8 @@ namespace OIC namespace { std::mutex cbMutex; - void vertifyObserveCB( + + void verifyObserveCB( const HeaderOptions &_hos, const ResponseStatement &_rep, int _result, int _seq, std::weak_ptr rpPtr) { @@ -50,14 +51,15 @@ namespace OIC Ptr->onObserve(_hos, _rep, _result, _seq); } } - ObserveCB vertifiedObserveCB(std::weak_ptr rpPtr) + + ObserveCB verifiedObserveCB(std::weak_ptr rpPtr) { - return std::bind(vertifyObserveCB, + return std::bind(verifyObserveCB, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, rpPtr); } - void vertifyGetCB( + void verifyGetCB( const HeaderOptions &_hos, const ResponseStatement &_rep, int _result, std::weak_ptr rpPtr) { @@ -68,9 +70,10 @@ namespace OIC Ptr->onGet(_hos, _rep, _result); } } - GetCB vertifiedGetCB(std::weak_ptr rpPtr) + + GetCB verifiedGetCB(std::weak_ptr rpPtr) { - return std::bind(vertifyGetCB, + return std::bind(verifyGetCB, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, rpPtr); } @@ -115,8 +118,8 @@ namespace OIC void DataCache::initializeDataCache(PrimitiveResourcePtr pResource) { sResource = pResource; - pObserveCB = vertifiedObserveCB(std::weak_ptr(shared_from_this())); - pGetCB = vertifiedGetCB(std::weak_ptr(shared_from_this())); + pObserveCB = verifiedObserveCB(std::weak_ptr(shared_from_this())); + pGetCB = verifiedGetCB(std::weak_ptr(shared_from_this())); pTimerCB = (TimerCB)(std::bind(&DataCache::onTimeOut, this, std::placeholders::_1)); pPollingCB = (TimerCB)(std::bind(&DataCache::onPollingOut, this, std::placeholders::_1)); -- 2.7.4