projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ResourceObject to RCSResourceObject
[platform/upstream/iotivity.git]
/
service
/
notification-manager
/
NotificationManager
/
src
/
HostingObject.cpp
diff --git
a/service/notification-manager/NotificationManager/src/HostingObject.cpp
b/service/notification-manager/NotificationManager/src/HostingObject.cpp
index
8dcf868
..
c831e25
100644
(file)
--- a/
service/notification-manager/NotificationManager/src/HostingObject.cpp
+++ b/
service/notification-manager/NotificationManager/src/HostingObject.cpp
@@
-164,13
+164,13
@@
void HostingObject::dataChangedCB(const ResourceAttributes & attributes, RemoteO
ResourceAttributes rData;
{
ResourceAttributes rData;
{
- ResourceObject::LockGuard guard(mirroredServer);
+ R
CSR
esourceObject::LockGuard guard(mirroredServer);
rData = mirroredServer->getAttributes();
}
if(rData.empty() || rData != attributes)
{
{
rData = mirroredServer->getAttributes();
}
if(rData.empty() || rData != attributes)
{
{
- ResourceObject::LockGuard guard(mirroredServer);
+ R
CSR
esourceObject::LockGuard guard(mirroredServer);
for(auto it = rData.begin(); ; ++it)
{
if(it == rData.end())
for(auto it = rData.begin(); ; ++it)
{
if(it == rData.end())
@@
-205,11
+205,11
@@
HostingObject::ResourceObjectPtr HostingObject::createMirroredServer(RemoteObjec
{
std::string type = types.begin()->c_str();
std::string interface = interfaces.begin()->c_str();
{
std::string type = types.begin()->c_str();
std::string interface = interfaces.begin()->c_str();
- retResource = ResourceObject::Builder(uri, type, interface).
+ retResource = R
CSR
esourceObject::Builder(uri, type, interface).
setDiscoverable(true).setObservable(true).build();
// TODO need to bind types and interfaces
setDiscoverable(true).setObservable(true).build();
// TODO need to bind types and interfaces
- retResource->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+ retResource->setAutoNotifyPolicy(R
CSR
esourceObject::AutoNotifyPolicy::UPDATED);
retResource->setSetRequestHandler(pSetRequestHandler);
}catch(...)
{
retResource->setSetRequestHandler(pSetRequestHandler);
}catch(...)
{