Merge "C++ SDK Adding OCConnectivity Type" into connectivity-abstraction

[platform/upstream/iotivity.git] / resource / include / OCPlatform_impl.h

diff --git a/resource/include/OCPlatform_impl.h b/resource/include/OCPlatform_impl.h
index b4d4810..6f7ca58 100644 (file)
--- a/resource/include/OCPlatform_impl.h
+++ b/resource/include/OCPlatform_impl.h
@@ -142,9 +142,10 @@ namespace OC
         */
 #ifdef CA_INT
         OCStackResult findResource(const std::string& host, const std::string& resourceURI,
-                    uint8_t connectivityType, FindCallback resourceHandler);
+                    OCConnectivityType connectivityType, FindCallback resourceHandler);
         OCStackResult findResource(const std::string& host, const std::string& resourceURI,
-                    uint8_t connectivityType, FindCallback resourceHandler, QualityOfService QoS);
+                    OCConnectivityType connectivityType, FindCallback resourceHandler,
+                    QualityOfService QoS);
 #else
         OCStackResult findResource(const std::string& host, const std::string& resourceURI,
                     FindCallback resourceHandler);
@@ -163,9 +164,9 @@ namespace OC
          */
 #ifdef CA_INT
         OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI,
-                    uint8_t connectivityType, FindDeviceCallback deviceInfoHandler);
+                    OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler);
         OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI,
-                    uint8_t connectivityType, FindDeviceCallback deviceInfoHandler,
+                    OCConnectivityType connectivityType, FindDeviceCallback deviceInfoHandler,
                     QualityOfService QoS);
 #else
         OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI,
@@ -173,6 +174,7 @@ namespace OC
         OCStackResult getDeviceInfo(const std::string& host, const std::string& deviceURI,
                     FindDeviceCallback deviceInfoHandler, QualityOfService QoS);
 #endif
+
         /**
         * This API registers a resource with the server
         * NOTE: This API applies to server side only.
@@ -418,9 +420,9 @@ namespace OC
         */
 #ifdef CA_INT
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
-                        uint8_t connectivityType, SubscribeCallback presenceHandler);
+                        OCConnectivityType connectivityType, SubscribeCallback presenceHandler);
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
-                        const std::string& resourceType, uint8_t connectivityType,
+                        const std::string& resourceType, OCConnectivityType connectivityType,
                         SubscribeCallback presenceHandler);
 #else
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
@@ -467,7 +469,7 @@ namespace OC
         */
 #ifdef CA_INT
         OCResource::Ptr constructResourceObject(const std::string& host, const std::string& uri,
-                        uint8_t connectivityType, bool isObservable,
+                        OCConnectivityType connectivityType, bool isObservable,
                         const std::vector<std::string>& resourceTypes,
                         const std::vector<std::string>& interfaces);
 #else