From: vsr <vsr@opencascade.com>
Date: Thu, 25 Nov 2010 13:16:37 +0000 (+0000)
Subject: Merge from V5_1_main branch 24/11/2010
X-Git-Tag: V6_2_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5590767f4a32abe75480266d1f5e01d3ec7c0e1b;p=tools%2Fhxx2salome.git

Merge from V5_1_main branch 24/11/2010
---

diff --git a/scripts/parse3.awk b/scripts/parse3.awk
index 8d3107d..0c5c560 100644
--- a/scripts/parse3.awk
+++ b/scripts/parse3.awk
@@ -53,6 +53,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
@@ -133,6 +135,7 @@ BEGIN {
   idl_impl_hxx["in SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"]="SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr"
   idl_impl_hxx["SALOME_MED::MEDCouplingUMeshCorbaInterface"]="SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr"
   idl_impl_hxx["SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"]="SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr"
+  idl_impl_hxx["out SALOME_MED::MEDCouplingFieldDoubleCorbaInterface"]="SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_out"
 #
 #
 # table for c++ code generation : argument's processing
@@ -179,8 +182,12 @@ BEGIN {
 #  cpp_impl_a["const std::vector<int>&"]="\tlong _%s_size;\n\tint *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\
 #             "\tstd::vector<int> _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;"
   cpp_impl_a["std::vector<int>*&"]="\tstd::vector<int>* _%s;\n"
-  cpp_impl_a["const ParaMEDMEM::MEDCouplingFieldDouble*"]="\tSALOME_MED::MEDCouplingFieldDoubleCorbaInterface::_duplicate(%s);\n"\
+  cpp_impl_a["const ParaMEDMEM::MEDCouplingFieldDouble*"]=\
             "\tParaMEDMEM::MEDCouplingFieldDouble* _%s=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(%s);\n"
+  cpp_impl_a["const ParaMEDMEM::MEDCouplingFieldDouble&"]=\
+            "\tParaMEDMEM::MEDCouplingFieldDouble* __%s=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(%s);\n"\
+            "\tParaMEDMEM::MEDCouplingFieldDouble& _%s=*__%s;\n"
+  cpp_impl_a["ParaMEDMEM::MEDCouplingFieldDouble*&"]="\tParaMEDMEM::MEDCouplingFieldDouble* _%s;\n"
 #
 #
 # table for c++ code generation : returned value processing
@@ -304,6 +311,11 @@ BEGIN {
   cpp_impl_c["const MEDMEM::SUPPORT&"]="\t_%s->removeReference();\n"
   cpp_impl_c["const MEDMEM::SUPPORT*"]="\t_%s->removeReference();\n"
   cpp_impl_c["const ParaMEDMEM::MEDCouplingFieldDouble*"]="\t_%s->decrRef();\n"
+  cpp_impl_c["const ParaMEDMEM::MEDCouplingFieldDouble&"]="\t__%s->decrRef();\n"
+  cpp_impl_c["ParaMEDMEM::MEDCouplingFieldDouble*&"]= \
+      "\tParaMEDMEM::MEDCouplingFieldDoubleServant * %s_out=new ParaMEDMEM::MEDCouplingFieldDoubleServant(_%s);\
+	_%s->decrRef();							\
+	%s = %s_out->_this();\n"
 #
 #
 # record sep is ");\n" whith blanks all around, and optional "(" at the beginning
diff --git a/scripts/template_coupling_src.tgz b/scripts/template_coupling_src.tgz
index 5171d89..d205705 100644
Binary files a/scripts/template_coupling_src.tgz and b/scripts/template_coupling_src.tgz differ