CCAR: complete merge from V5_1_5_BR

diff --git a/Examples/hxx1/test_compohxx.py b/Examples/hxx1/test_compohxx.py
index 9d84a6a2fd3ac50a40cc19e31ed5ce8cb9371263..bd8fbe9a65e6e474a9b4abc9fddc94c5f55748cb 100644 (file)
--- a/Examples/hxx1/test_compohxx.py
+++ b/Examples/hxx1/test_compohxx.py
@@ -12,7 +12,7 @@ import SALOME
 import salome
 salome.salome_init()
 print "Test du composant CALCUL généré généré par hxx2salome"
-import hxxcompos
+import hxxcompos_ORB
 myCalc = salome.lcc.FindOrLoadComponent("FactoryServer", "CALCUL")
 print "10+15 = ",myCalc.add(10,15)
 print "10x15 = ",myCalc.mul(10,15)
@@ -121,9 +121,9 @@ myCoco2 = salome.lcc.FindOrLoadComponent("FactoryServerI2", "ICOCO")
 #
 myCoco1.initialize()
 m=myCoco1.getInputFieldTemplate("TargetField")
-#myCoco1.solve()  to test with 5.1.5
-#f=myCoco1.getOutputField("SourceField")
-#myCoco2.printField(f)
+myCoco1.solve()  #to test with 5.1.5
+f=myCoco1.getOutputField("SourceField")
+myCoco2.printField(f)
 #
 print "##################################"
 print "Fin test hxx2salome/ICOCO/A2"

diff --git a/module_generator/hxx_tmpl.py b/module_generator/hxx_tmpl.py
index 0ca550733c6a56a814f864f7840ccc212cfed7b0..3e25a10fef42b3997a12813cc9755955b8df8526 100644 (file)
--- a/module_generator/hxx_tmpl.py
+++ b/module_generator/hxx_tmpl.py
@@ -109,7 +109,7 @@ ${compodefs}
 class ${component};  // forward declaration
 
 class ${component}_i: ${inheritedclass}
-  public POA_${module}::${component}_Gen,
+  public POA_${module}_ORB::${component}_Gen,
   public Engines_Component_i,
   public SALOMEMultiComm
 {
@@ -171,7 +171,7 @@ dist_lib${component}Engine_la_SOURCES = \
        ${component}_i.cxx
 
 lib${component}Engine_la_CXXFLAGS = -I$$(top_builddir)/idl  $$(SALOME_INCLUDES) ${includes}
-lib${component}Engine_la_LIBADD   = ${libs} -L$$(top_builddir)/idl -l${module} $${SALOME_LIBS} $$(FLIBS)
+lib${component}Engine_la_LIBADD   = ${libs} -L$$(top_builddir)/idl -lSalomeIDL${module} $${SALOME_LIBS} $$(FLIBS)
 
 
 """

diff --git a/module_generator/hxxcompo.py b/module_generator/hxxcompo.py
index ff023ef19f25063568683e17ce8c5504c88823d3..1d551e750d991c66f38e925e958660f73666b585 100644 (file)
--- a/module_generator/hxxcompo.py
+++ b/module_generator/hxxcompo.py
@@ -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,