From: jyong2.kim Date: Wed, 17 Jun 2015 11:56:45 +0000 (+0900) Subject: Apply changed namespace of PrimitiveResource for ResourceCache X-Git-Tag: 1.2.0+RC1~1430^2~120 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd15eaf823d6213648ccc8853180edda573d867d;p=platform%2Fupstream%2Fiotivity.git Apply changed namespace of PrimitiveResource for ResourceCache add PrimitiveResource's namespace. update library name that is 'service_common'. Change-Id: I3ae06aff72d208f3966da4a42f98f7ce37f445c9 Signed-off-by: jyong2.kim Reviewed-on: https://gerrit.iotivity.org/gerrit/1327 Reviewed-by: Madan Lanka Tested-by: Uze Choi --- diff --git a/service/basis/resourceCache/SConscript b/service/basis/resourceCache/SConscript index 754f7ad..f2d263e 100644 --- a/service/basis/resourceCache/SConscript +++ b/service/basis/resourceCache/SConscript @@ -43,7 +43,7 @@ target_os = env.get('TARGET_OS') ###################################################################### resourcecache_env.AppendUnique(CPPPATH = ['include']) resourcecache_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include']) -resourcecache_env.PrependUnique(LIBS = ['ServiceCommon', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) +resourcecache_env.PrependUnique(LIBS = ['service_common', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) if target_os not in ['windows', 'winrt']: resourcecache_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++11']) diff --git a/service/basis/resourceCache/include/CacheTypes.h b/service/basis/resourceCache/include/CacheTypes.h index 260038f..8793cb8 100644 --- a/service/basis/resourceCache/include/CacheTypes.h +++ b/service/basis/resourceCache/include/CacheTypes.h @@ -33,6 +33,8 @@ #define CACHE_TAG PCF("CACHE") +using namespace OIC::Service; + class DataCache; enum class REPORT_FREQUENCY