Fix build error on gcc-4.6.
Change-Id: Ibbe48e519f1e4537133ce8775e16be1bc88ff0a3
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1711
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
return retResource;
}
-PrimitiveSetResponse HostingObject::setRequestHandler(const PrimitiveRequest & primitiveRequest,
+RCSSetResponse HostingObject::setRequestHandler(const RCSRequest & primitiveRequest,
ResourceAttributes & resourceAttibutes)
{
try
throw;
}
- return PrimitiveSetResponse::create(resourceAttibutes);
+ return RCSSetResponse::create(resourceAttibutes);
}
} /* namespace Service */
class HostingObject
{
private:
- using ResourceObjectPtr = std::shared_ptr<ResourceObject>;
- using RemoteObjectPtr = std::shared_ptr<RemoteResourceObject>;
- using RequestObjectPtr = std::shared_ptr<RequestObject>;
- using PrimiteveResourcePtr = std::shared_ptr<PrimitiveResource>;
+ typedef std::shared_ptr<ResourceObject> ResourceObjectPtr;
+ typedef std::shared_ptr<RemoteResourceObject> RemoteObjectPtr;
+ typedef std::shared_ptr<RequestObject> RequestObjectPtr;
+ typedef std::shared_ptr<PrimitiveResource> PrimiteveResourcePtr;
- using BrokerCallback = std::function<void(ResourceState)>;
- using CacheCallback = std::function<void(const ResourceAttributes &)>;
- using DestroyedCallback = std::function<void()>;
+ typedef std::function<void(ResourceState)> BrokerCallback;
+ typedef std::function<void(const ResourceAttributes &)> CacheCallback;
+ typedef std::function<void()> DestroyedCallback;
- using SetRequestHandler = std::function<PrimitiveSetResponse(const PrimitiveRequest&,
- ResourceAttributes&)>;
+ typedef std::function<
+ RCSSetResponse(const RCSRequest&, ResourceAttributes&)> SetRequestHandler;
public:
HostingObject() = default;
void stateChangedCB(ResourceState state, RemoteObjectPtr rObject);
void dataChangedCB(const ResourceAttributes & attributes, RemoteObjectPtr rObject);
- PrimitiveSetResponse setRequestHandler(
- const PrimitiveRequest & request, ResourceAttributes & attributes);
+ RCSSetResponse setRequestHandler(
+ const RCSRequest & request, ResourceAttributes & attributes);
void destroyHostingObject();
{
void RequestObject::invokeRequest(RemoteObjectPtr remoteObject, RequestMethod method,
- const PrimitiveRequest & pRequest, ResourceAttributes & resourceAttibutes)
+ const RCSRequest & pRequest, ResourceAttributes & resourceAttibutes)
{
try
{
class RequestObject
{
public:
- using RemoteObjectPtr = std::shared_ptr<RemoteResourceObject>;
+ typedef std::shared_ptr<RemoteResourceObject> RemoteObjectPtr;
enum class RequestMethod
{
~RequestObject() = default;
void invokeRequest(RemoteObjectPtr remoteObject, RequestMethod method,
- const PrimitiveRequest & pRequest, ResourceAttributes & resourceAttibutes);
+ const RCSRequest & pRequest, ResourceAttributes & resourceAttibutes);
private:
void setRequestCB(const ResourceAttributes & returnedAttributes,
class ResourceHosting
{
private:
- using HostingObjectPtr = std::shared_ptr<HostingObject>;
- using RemoteObjectPtr = std::shared_ptr<RemoteResourceObject>;
- using PrimiteveResourcePtr = std::shared_ptr<PrimitiveResource>;
-
- using SubscribeCallback
- = std::function<void(OCStackResult, const unsigned int, const std::string&) >;
- using DiscoveryCallback
- = std::function<void(std::shared_ptr<RemoteResourceObject>)>;
- using DestroyedCallback
- = std::function<void()>;
+ typedef std::shared_ptr<HostingObject> HostingObjectPtr;
+ typedef std::shared_ptr<RemoteResourceObject> RemoteObjectPtr;
+ typedef std::shared_ptr<PrimitiveResource> PrimiteveResourcePtr;
+
+ typedef std::function<
+ void(OCStackResult, const unsigned int, const std::string&)> SubscribeCallback;
+ typedef std::function<
+ void(std::shared_ptr<RemoteResourceObject>)> DiscoveryCallback;
+ typedef std::function<void()> DestroyedCallback;
public:
void startHosting();