]> SALOME platform Git repositories - tools/yacsgen.git/commitdiff
Salome HOME
bug correction : variables use_medmem and use_medcoupling were overriden RELIQUAT_5x_15112010 V5_1_main_FINAL
authorcrouzet <crouzet>
Mon, 13 Dec 2010 14:44:11 +0000 (14:44 +0000)
committercrouzet <crouzet>
Mon, 13 Dec 2010 14:44:11 +0000 (14:44 +0000)
module_generator/hxxcompo.py

index ff023ef19f25063568683e17ce8c5504c88823d3..70443390dc54c25921806bb6e1a6429837bda0a3 100644 (file)
@@ -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,