From e091c8db13d15e94e64053a3c454253c1669a208 Mon Sep 17 00:00:00 2001 From: "jyong2.kim" Date: Wed, 17 Jun 2015 22:05:08 +0900 Subject: [PATCH] Apply Primitive Resource's namespace for Broker add primitive resource namespace. update library name that is 'service_common'. change OCConnectivityType to 'CT_IP_USE_V4'. Change-Id: I7bec24b9e53691fcdd2a79f9436831b30697a3f5 Signed-off-by: jyong2.kim Reviewed-on: https://gerrit.iotivity.org/gerrit/1329 Reviewed-by: Madan Lanka Reviewed-by: kwon doil Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/basis/resourceBroker/SConscript | 4 ++-- service/basis/resourceBroker/include/BrokerTypes.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service/basis/resourceBroker/SConscript b/service/basis/resourceBroker/SConscript index b71f220..4780137 100755 --- a/service/basis/resourceBroker/SConscript +++ b/service/basis/resourceBroker/SConscript @@ -44,7 +44,7 @@ target_os = env.get('TARGET_OS') resourcebroker_env.AppendUnique(CPPPATH = ['include']) resourcebroker_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include']) resourcebroker_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -resourcebroker_env.PrependUnique(LIBS = ['ServiceCommon','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) +resourcebroker_env.PrependUnique(LIBS = ['service_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) if target_os not in ['windows', 'winrt']: @@ -71,6 +71,6 @@ else : resourcebroker_env.InstallTarget(resourcebrokersdk, 'libResouceBroker') # Go to build sample apps -SConscript('SampleApp/SConscript') +#SConscript('SampleApp/SConscript') diff --git a/service/basis/resourceBroker/include/BrokerTypes.h b/service/basis/resourceBroker/include/BrokerTypes.h index 625510b..e61c319 100755 --- a/service/basis/resourceBroker/include/BrokerTypes.h +++ b/service/basis/resourceBroker/include/BrokerTypes.h @@ -32,8 +32,9 @@ #define BROKER_TAG PCF("BROKER") -#define BROKER_TRANSPORT OCConnectivityType::OC_IPV4 +#define BROKER_TRANSPORT OCConnectivityType::CT_IP_USE_V4 +using namespace OIC::Service; struct BrokerRequesterInfo; class ResourcePresence; -- 2.7.4