X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fresource-encapsulation%2Fsrc%2FserverBuilder%2Fsrc%2FRCSResourceObject.cpp;h=cecfb1d577faf49d65d74cde842ed6588cd997dd;hb=bdec944c51c8e0063b6ee0890170e828ac8f2b96;hp=1a40150306687fb838c134dc3a3a5617cf84b731;hpb=fdb749013be29954060278b4a18af5f8c0ec29ea;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp index 1a40150..cecfb1d 100644 --- a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp +++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp @@ -34,6 +34,9 @@ #include "logger.h" #include "OCPlatform.h" +#ifdef LOG_TAG +#undef LOG_TAG +#endif #define LOG_TAG "RCSResourceObject" namespace @@ -815,7 +818,7 @@ namespace OIC m_resourceObject, m_resourceObject.m_resourceAttributes, m_autoNotifyPolicy); } - RCSResourceObject::WeakGuard::WeakGuard( + RCSResourceObject::WeakGuard::WeakGuard( const RCSResourceObject& resourceObject) : m_isOwningLock{ false }, m_resourceObject(resourceObject)