update ResourceCache Module files for the reorganisation of directory path

Change-Id: Id57afa8ba10fad15a198a16886a731d418f231d0
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1709
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/src/resourceCache/SConscript b/service/resource-manipulation/src/resourceCache/SConscript
index d3b2296..42c88cc 100644 (file)
--- a/service/resource-manipulation/src/resourceCache/SConscript
+++ b/service/resource-manipulation/src/resourceCache/SConscript
@@ -42,6 +42,7 @@ target_os = env.get('TARGET_OS')
 # Build flags
 ######################################################################
 resourcecache_env.AppendUnique(CPPPATH = ['include'])
+resourcecache_env.AppendUnique(CPPPATH = ['../../include'])
 resourcecache_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include'])
 resourcecache_env.AppendUnique(CPPPATH = ['../common/expiryTimer/include'])
 resourcecache_env.AppendUnique(CPPPATH = ['../common/expiryTimer/src'])

diff --git a/service/resource-manipulation/src/resourceCache/include/DataCache.h b/service/resource-manipulation/src/resourceCache/include/DataCache.h
index 4030727..bd5fbac 100755 (executable)
--- a/service/resource-manipulation/src/resourceCache/include/DataCache.h
+++ b/service/resource-manipulation/src/resourceCache/include/DataCache.h
@@ -35,8 +35,8 @@ namespace OIC
         class DataCache
         {
         public:
-            using TimerID = unsigned int;
-            using TimerCB = std::function<void*(TimerID)>;
+            typedef unsigned int TimerID;
+            typedef std::function<void *(TimerID)> TimerCB;
 
         public:
             DataCache();

diff --git a/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h b/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h
index 273e498..b4c5133 100755 (executable)
--- a/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h
+++ b/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h
@@ -36,11 +36,11 @@ namespace OIC
         class ResourceCacheManager
         {
         public:
-            class InvalidParameterException: public PrimitiveException
+            class InvalidParameterException: public RCSException
             {
             public:
                 InvalidParameterException(std::string&& what)
-                : PrimitiveException{ std::move(what) } {}
+                : RCSException{ std::move(what) } {}
             };
 
             static ResourceCacheManager * getInstance();