From 5150530e6826492886a3f30267dd5c3c9d554e9a Mon Sep 17 00:00:00 2001 From: Minji Park Date: Thu, 18 Jun 2015 14:02:15 +0900 Subject: [PATCH] apply added namespace to ResourceContainer, change SConscript for modified library name - apply added namespace of ServerBuilder and PrimitiveResource to ResourceContainer code - modifiy SConscript of ResourceContainer due to changed library name of ServerBuilder and PrimitiveResource Change-Id: I52fd959be651a1bcab0300b33376ed7294433faf Signed-off-by: Minji Park Reviewed-on: https://gerrit.iotivity.org/gerrit/1335 Tested-by: jenkins-iotivity Reviewed-by: Hun-je Yeon Reviewed-by: Uze Choi --- service/basis/resourceContainer/SConscript | 6 +++--- service/basis/resourceContainer/src/ResourceContainerImpl.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/basis/resourceContainer/SConscript b/service/basis/resourceContainer/SConscript index d544610..01af0b6 100644 --- a/service/basis/resourceContainer/SConscript +++ b/service/basis/resourceContainer/SConscript @@ -52,7 +52,7 @@ if target_os == 'android': resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log']) #resource_container_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -resource_container_env.PrependUnique(LIBS = ['ServerBuilder', 'ServiceCommon', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction', 'coap']) +resource_container_env.PrependUnique(LIBS = ['server_builder', 'service_common', 'oc','octbstack', 'oc_logger', 'oc_logger_core', 'connectivity_abstraction']) resource_container_env.AppendUnique(LIBS = ['dl']) ###################################################################### @@ -76,7 +76,7 @@ resource_container_env.InstallTarget([res_container_static,res_container_shared] ###################################################################### # build Sample Resource Bundle ###################################################################### -SConscript('resource-container/examples/SampleBundle/SConscript') +#SConscript('resource-container/examples/SampleBundle/SConscript') sample_resource_bundle_env = resource_container_env.Clone() sample_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) @@ -105,4 +105,4 @@ Ignore("examples/ResourceContainerConfig.xml", "examples/ResourceContainerConfig containertestapp = containertest_env.Program('ContainerTest', res_container_src) Alias("containertest", containertestapp) -env.AppendTarget('containertest') \ No newline at end of file +env.AppendTarget('containertest') diff --git a/service/basis/resourceContainer/src/ResourceContainerImpl.cpp b/service/basis/resourceContainer/src/ResourceContainerImpl.cpp index 8b0cf63..fe64f35 100644 --- a/service/basis/resourceContainer/src/ResourceContainerImpl.cpp +++ b/service/basis/resourceContainer/src/ResourceContainerImpl.cpp @@ -27,7 +27,6 @@ #include "PrimitiveResponse.h" #include "PrimitiveServerResource.h" - #include #include #include @@ -37,6 +36,7 @@ #include "oc_logger.hpp" using OC::oc_log_stream; +using namespace OIC::Service; /* Annother way to create a context: */ auto info_logger = []() -> boost::iostreams::stream & -- 2.7.4