Gcc fix for SoftSensorResource, ResourceClientTest

Added algorithm header file and conditionvariable header file

Change-Id: I4db4ad7d9079973925ecbcd558ffe3ded1f581d4
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2060
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp
index 77b618f..c45cb7b 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp
@@ -20,6 +20,7 @@
 
 #include "SoftSensorBundleActivator.h"
 #include "DiscomfortIndexSensorResource.h"
+#include <algorithm>
 
 SoftSensorBundleActivator *bundle;
 
@@ -113,4 +114,4 @@ extern "C" void externalCreateResource(resourceInfo resourceInfo)
 extern "C" void externalDestroyResource(BundleResource *pBundleResource)
 {
     bundle->destroyResource(pBundleResource);
-}
\ No newline at end of file
+}

diff --git a/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp b/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp
index 5178384..7767e11 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp
@@ -19,6 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include "SoftSensorResource.h"
+#include <algorithm>
 
 using namespace OIC::Service;
 namespace OIC
@@ -60,11 +61,9 @@ namespace OIC
 
         void SoftSensorResource::setAttribute(std::string key, RCSResourceAttributes::Value &&value)
         {
-            std::list<std::string>::iterator itor = std::find(m_inputList.begin(), m_inputList.end(), key);
-
             BundleResource::setAttribute(key, value.toString());
 
-            if (itor != m_inputList.end())
+            if (std::find(m_inputList.begin(), m_inputList.end(), key) != m_inputList.end())
                 executeLogic();
         }
 

diff --git a/service/resource-encapsulation/unittests/ResourceClientTest.cpp b/service/resource-encapsulation/unittests/ResourceClientTest.cpp
index 9486e90..c51d1a5 100644 (file)
--- a/service/resource-encapsulation/unittests/ResourceClientTest.cpp
+++ b/service/resource-encapsulation/unittests/ResourceClientTest.cpp
@@ -23,6 +23,7 @@
 #include "RCSDiscoveryManager.h"
 #include "RCSResourceObject.h"
 #include "PrimitiveResource.h"
+#include <condition_variable>
 
 #include <mutex>