Imported Upstream version 0.9.1

[platform/upstream/iotivity.git] / service / soft-sensor-manager / SSMCore / src / SSMInterface / SSMCore.h

diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore.h b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore.h
index 4c690d4..6ef73b9 100644 (file)
--- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore.h
+++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore.h
@@ -28,17 +28,6 @@ using namespace OIC;
 
 #define IN
 #define OUT
-/*
-#if defined(WIN32) && defined(SSMCORE_WINDOWS_EXPORTS)
-#define INTERFACE_DECLSPEC    __declspec(dllexport)
-#elif defined(WIN32)
-#define INTERFACE_DECLSPEC    __declspec(dllimport)
-#pragma comment(lib, "SSMCore_Windows.lib")
-#else
-#define INTERFACE_DECLSPEC
-#endif
-*/
-#define INTERFACE_DECLSPEC
 
 /**
 * @class    IQueryEngine
@@ -63,7 +52,7 @@ class IQueryEngine
         * @exception
         * @see
         */
-        virtual SSMRESULT executeContextQuery(IN std::string contextQuery, OUT int *cqid) = 0;
+        virtual SSMRESULT executeContextQuery(std::string contextQuery, int *cqid) = 0;
 
         /**
         * @fn     registerQueryEvent
@@ -76,7 +65,7 @@ class IQueryEngine
         * @exception
         * @see
         */
-        virtual SSMRESULT registerQueryEvent(IN IQueryEngineEvent *pQueryEngineEvent) = 0;
+        virtual SSMRESULT registerQueryEvent(IQueryEngineEvent *pQueryEngineEvent) = 0;
 
         /**
         * @fn     unregisterQueryEvent
@@ -89,7 +78,7 @@ class IQueryEngine
         * @exception
         * @see
         */
-        virtual SSMRESULT unregisterQueryEvent(IN IQueryEngineEvent *pQueryEngineEvent) = 0;
+        virtual SSMRESULT unregisterQueryEvent(IQueryEngineEvent *pQueryEngineEvent) = 0;
 
         /**
         * @fn    killContextQuery
@@ -102,7 +91,7 @@ class IQueryEngine
         * @exception
         * @see
         */
-        virtual SSMRESULT killContextQuery(IN int cqid) = 0;
+        virtual SSMRESULT killContextQuery(int cqid) = 0;
     protected:
         virtual ~IQueryEngine() {};
 };
@@ -123,7 +112,7 @@ extern "C"
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC SSMRESULT CreateQueryEngine(OUT IQueryEngine **ppQueryEngine);
+INTERFACE_DECLSPEC SSMRESULT CreateQueryEngine(IQueryEngine **ppQueryEngine);
 
 /**
 * @fn    ReleaseQueryEngine
@@ -136,7 +125,7 @@ INTERFACE_DECLSPEC SSMRESULT CreateQueryEngine(OUT IQueryEngine **ppQueryEngine)
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC unsigned long ReleaseQueryEngine(IN IQueryEngine *pQueryEngine);
+INTERFACE_DECLSPEC unsigned long ReleaseQueryEngine(IQueryEngine *pQueryEngine);
 
 
 /**
@@ -151,7 +140,7 @@ INTERFACE_DECLSPEC unsigned long ReleaseQueryEngine(IN IQueryEngine *pQueryEngin
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC SSMRESULT InitializeSSMCore(IN std::string xmlDescription);
+INTERFACE_DECLSPEC SSMRESULT InitializeSSMCore(std::string xmlDescription);
 
 /**
 * @fn    StartSSMCore
@@ -190,7 +179,7 @@ INTERFACE_DECLSPEC SSMRESULT StopSSMCore();
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC SSMRESULT TerminateSSMCore(IN bool factoryResetFlag = false);
+INTERFACE_DECLSPEC SSMRESULT TerminateSSMCore(bool factoryResetFlag = false);
 
 /**
 * @fn    GetErrorMessage
@@ -203,7 +192,7 @@ INTERFACE_DECLSPEC SSMRESULT TerminateSSMCore(IN bool factoryResetFlag = false);
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC const char *GetSSMError(IN SSMRESULT res);
+INTERFACE_DECLSPEC const char *GetSSMError(SSMRESULT res);
 
 /**
 * @fn    GetInstalledModelList
@@ -216,7 +205,7 @@ INTERFACE_DECLSPEC const char *GetSSMError(IN SSMRESULT res);
 * @exception
 * @see
 */
-INTERFACE_DECLSPEC SSMRESULT GetInstalledModelList(OUT std::vector<ISSMResource *> *pList);
+INTERFACE_DECLSPEC SSMRESULT GetInstalledModelList(std::vector<ISSMResource *> *pList);
 
 #ifdef __cplusplus
 }