From c6828c93bdcec308c0fada08c99a3d2c37813170 Mon Sep 17 00:00:00 2001 From: crouzet Date: Mon, 13 Dec 2010 14:44:11 +0000 Subject: [PATCH] bug correction : variables use_medmem and use_medcoupling were overriden --- module_generator/hxxcompo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module_generator/hxxcompo.py b/module_generator/hxxcompo.py index ff023ef..7044339 100644 --- a/module_generator/hxxcompo.py +++ b/module_generator/hxxcompo.py @@ -191,6 +191,8 @@ class HXX2SALOMEComponent(Component): # Create a list of services, and give it to Component constructor services=[] from hxx_awk import cpp2yacs_mapping + self.use_medmem=False + self.use_medcoupling=False for serv in list_of_services: # for inports and outports, Service class expects a list of tuples, each tuple containing the name and the yacs type of the port # thus we need to convert c++ types to yacs types (we use for that the cpp2yacs_mapping table @@ -206,8 +208,6 @@ class HXX2SALOMEComponent(Component): Return=cpp2yacs_mapping[service_definition[serv]["ret"]] # find out if component uses medmem types and/or medcoupling types - self.use_medmem=False - self.use_medcoupling=False for (argname,argtype) in inports + outports + [("return",Return)]: if moduleTypes[argtype]=="MED": if argtype.count("Coupling")>0: @@ -324,7 +324,7 @@ include $(top_srcdir)/adm_local/make_common_starter.am defs.append(serv.defs) service = cxxService.substitute(component=self.name, service=serv.name,ret=corba_rtn_type(serv.ret,gen.module.name), parameters=gen.makeArgs(serv), - body=serv.body % {"module":gen.module.name} ) + body=serv.body % {"module":gen.module.name+"_ORB"} ) services.append(service) return cxxCompo.substitute(component=self.name, inheritedconstructor=self.inheritedconstructor, -- 2.39.2