patch error of merge from V5_1_5_BR

diff --git a/module_generator/hxx_awk.py b/module_generator/hxx_awk.py
index 839f3ca88d722c9f592bc6af1180252f4a6a32e3..777e6216e4b25ce2295d2f019bfd5ead35f55ff3 100644 (file)
--- a/module_generator/hxx_awk.py
+++ b/module_generator/hxx_awk.py
@@ -33,6 +33,8 @@ cpp2idl_mapping["MEDMEM::FIELD<int>*&"]="out SALOME_MED::FIELDINT"
 cpp2idl_mapping["const std::vector<int>&"]="in %(module)s::intvec"
 cpp2idl_mapping["std::vector<int>*&"]="out %(module)s::intvec"
 cpp2idl_mapping["const ParaMEDMEM::MEDCouplingFieldDouble*"]="in SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
+cpp2idl_mapping["const ParaMEDMEM::MEDCouplingFieldDouble&"]="in SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
+cpp2idl_mapping["ParaMEDMEM::MEDCouplingFieldDouble*&"]="out SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
 
 # ['stringvec', 'string', 'double', 'long', 'dblevec', 'file', 'intvec', 'dataref', 'GEOM_Object', 'SMESH_Mesh', 'SMESH_Hypothesis', 'SALOME_MED/MED', 'SALOME_MED/MESH', 'SALOME_MED/SUPPORT', 'SALOME_MED/FIELD', 'SALOME_MED/FIELDDOUBLE', 'SALOME_MED/FIELDINT']
 cpp2yacs_mapping={}
@@ -348,6 +350,8 @@ BEGIN {
   idl_arg_type["const std::vector<int>&"]="in SALOME::vectorOfLong"
   idl_arg_type["std::vector<int>*&"]="out SALOME::vectorOfLong"
   idl_arg_type["const ParaMEDMEM::MEDCouplingFieldDouble*"]="in SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
+  idl_arg_type["const ParaMEDMEM::MEDCouplingFieldDouble&"]="in SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
+  idl_arg_type["ParaMEDMEM::MEDCouplingFieldDouble*&"]="out SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"
 #
 #
 # mapping for returned types

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)
 
 
 """