Merge branch 'upstream' into tizen

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

diff --git a/resource/include/IServerWrapper.h b/resource/include/IServerWrapper.h
index ef45485..62f878a 100644 (file)
--- a/resource/include/IServerWrapper.h
+++ b/resource/include/IServerWrapper.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _I_SERVER_WRAPPER_H_
-#define _I_SERVER_WRAPPER_H_
+#ifndef OC_I_SERVER_WRAPPER_H_
+#define OC_I_SERVER_WRAPPER_H_
 
 #include <memory>
 #include <string>
@@ -57,15 +57,6 @@ namespace OC
         virtual OCStackResult registerPlatformInfo(
                     const OCPlatformInfo PlatformInfo) = 0;
 
-        virtual OCStackResult registerResourceWithHost(
-                    OCResourceHandle& resourceHandle,
-                    std::string& resourceHOST,
-                    std::string& resourceURI,
-                    const std::string& resourceTypeName,
-                    const std::string& resourceInterface,
-                    EntityHandler& entityHandler,
-                    uint8_t resourceProperty) = 0;
-
         virtual OCStackResult unregisterResource(
                     const OCResourceHandle& resourceHandle) = 0;
         virtual OCStackResult bindTypeToResource(