From a0af7c9e6fac83a6e77109cebf377a957ee2d25f Mon Sep 17 00:00:00 2001 From: "doil.kwon" Date: Fri, 18 Sep 2015 17:10:01 +0900 Subject: [PATCH] Code formatting for RCSDiscovery implementation. Change-Id: I2734731b8c467204e9382a08b185f6f9b9a7797e Signed-off-by: doil.kwon Reviewed-on: https://gerrit.iotivity.org/gerrit/2683 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- service/resource-encapsulation/include/RCSDiscoveryManager.h | 2 -- .../src/resourceClient/RCSDiscoveryManager.cpp | 8 ++++---- .../src/resourceClient/RCSDiscoveryManagerImpl.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/service/resource-encapsulation/include/RCSDiscoveryManager.h b/service/resource-encapsulation/include/RCSDiscoveryManager.h index 3f57cf4..b55daee 100755 --- a/service/resource-encapsulation/include/RCSDiscoveryManager.h +++ b/service/resource-encapsulation/include/RCSDiscoveryManager.h @@ -56,8 +56,6 @@ namespace OIC bool isCanceled(); ~DiscoveryTask(); - public: - DiscoveryTask(const DiscoveryTask&) = delete; DiscoveryTask(DiscoveryTask&&) = delete; DiscoveryTask& operator = (const DiscoveryTask&) const = delete; diff --git a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp index 8565573..5403023 100755 --- a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp +++ b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp @@ -30,14 +30,14 @@ namespace OIC { return &instance; } - std::unique_ptr RCSDiscoveryManager::discoverResource(const RCSAddress& address, - ResourceDiscoveredCallback cb) { + std::unique_ptr RCSDiscoveryManager::discoverResource + (const RCSAddress& address, ResourceDiscoveredCallback cb) { return discoverResourceByType(address, OC_RSRVD_WELL_KNOWN_URI, "", std::move(cb)); } - std::unique_ptr RCSDiscoveryManager::discoverResource(const RCSAddress& address, - const std::string& relativeURI, ResourceDiscoveredCallback cb) { + std::unique_ptr RCSDiscoveryManager::discoverResource + (const RCSAddress& address, const std::string& relativeURI, ResourceDiscoveredCallback cb) { return discoverResourceByType(address, relativeURI, "", std::move(cb)); } diff --git a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.cpp b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.cpp index f80cbd3..660a126 100755 --- a/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.cpp +++ b/service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.cpp @@ -75,8 +75,8 @@ namespace OIC } } - std::unique_ptr RCSDiscoveryManagerImpl::startDiscovery(const RCSAddress& address, - const std::string& relativeURI, const std::string& resourceType, + std::unique_ptr RCSDiscoveryManagerImpl::startDiscovery + (const RCSAddress& address, const std::string& relativeURI, const std::string& resourceType, RCSDiscoveryManager::ResourceDiscoveredCallback cb) { if (!cb) @@ -100,7 +100,8 @@ namespace OIC discoveryItem.m_relativeUri + "?rt=" +discoveryItem.m_resourceType, OCConnectivityType::CT_DEFAULT, discoveryItem.m_findCB); - return std::unique_ptr(new RCSDiscoveryManager::DiscoveryTask(discoverID)); + return std::unique_ptr( + new RCSDiscoveryManager::DiscoveryTask(discoverID)); } void RCSDiscoveryManagerImpl::initializedDiscoveryEnvironment() -- 2.7.4