projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from master to connectivity-abstraction branch
[platform/upstream/iotivity.git]
/
service
/
soft-sensor-manager
/
SampleApp
/
linux
/
SSMTesterApp
/
include
/
SSMTestApp.h
diff --git
a/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/include/SSMTestApp.h
b/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/include/SSMTestApp.h
index
63b94c8
..
c68304d
100644
(file)
--- a/
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/include/SSMTestApp.h
+++ b/
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/include/SSMTestApp.h
@@
-27,11
+27,9
@@
#include <string>
#include <string>
-#include "OCResource.h"
-#include "OCPlatform.h"
#include "SSMInterface.h"
#include "SSMInterface.h"
-#include "SSMClient.h"
-#include "ISSMClientListener.h"
+
+using namespace OIC;
namespace APPMenu
{
namespace APPMenu
{
@@
-47,11
+45,9
@@
typedef enum
ALL_DISCOMPORT = 2, HALF_DISCOMPORT, LITTLE_DISCOMPORT, ALL_COMPORT
} DIResult;
ALL_DISCOMPORT = 2, HALF_DISCOMPORT, LITTLE_DISCOMPORT, ALL_COMPORT
} DIResult;
-class SSMTestApp: public ISSMClientListener
- , public IQueryEngineEvent
+class SSMTestApp: public IQueryEngineEvent
{
private:
{
private:
- //SSMClient m_SSMClient;
SSMInterface m_SSMClient;
public:
SSMInterface m_SSMClient;
public:
@@
-63,7
+59,6
@@
class SSMTestApp: public ISSMClientListener
void unregisterQuery();
/* operations from listener interface */
void unregisterQuery();
/* operations from listener interface */
- void onRegisterQuery(const AttributeMap &attributeMap, SSMReturn &eCode);
SSMRESULT onQueryEngineEvent(int cqid, IDataReader *pResult);
};
SSMRESULT onQueryEngineEvent(int cqid, IDataReader *pResult);
};