CCAR: remove calls to cp_cd and cp_fin in wrapping and let user call them (or not)

explicitly

diff --git a/module_generator/aster_tmpl.py b/module_generator/aster_tmpl.py
index 80c255af0ea870ddbc580d7f32e52f032c2b34a4..ca89a46c0eb1e1ca18883a55ef3236eefbf0cc07 100644 (file)
--- a/module_generator/aster_tmpl.py
+++ b/module_generator/aster_tmpl.py
@@ -199,7 +199,7 @@ asterService="""
 
     if j.par_lot == 'NON':
        print "FIN EXECUTION"
-       err=calcium.cp_fin(self.proxy,calcium.CP_ARRET)
+       #err=calcium.cp_fin(self.proxy,calcium.CP_ARRET)
        #retour sans erreur (il faut pousser les variables de sortie)
        sys.stdout.flush()
        self.endService("${component}.${service}")
@@ -231,7 +231,7 @@ asterService="""
           raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,msg+'\\n'+str(j.cr),"${component}.py",0))
        else:
          #retour sans erreur (il faut pousser les variables de sortie)
-         err=calcium.cp_fin(self.proxy,calcium.CP_ARRET)
+         #err=calcium.cp_fin(self.proxy,calcium.CP_ARRET)
          sys.stdout.flush()
          self.endService("${component}.${service}")
          return ${rvars}

diff --git a/module_generator/cpp_tmpl.py b/module_generator/cpp_tmpl.py
index eadcce2095625444684adf1577bcce5f5dfb0838..cf028bae44a86f74c6d6094307315064ffe52c6c 100644 (file)
--- a/module_generator/cpp_tmpl.py
+++ b/module_generator/cpp_tmpl.py
@@ -311,19 +311,19 @@ void ${component}_i::${service}(${parameters})
 {
   beginService("${component}_i::${service}");
   Superv_Component_i * component = dynamic_cast<Superv_Component_i*>(this);
-  char       nom_instance[INSTANCE_LEN];
-  int info = cp_cd(component,nom_instance);
+  //char       nom_instance[INSTANCE_LEN];
+  //int info = cp_cd(component,nom_instance);
   try
     {
 //BODY
 ${body}
 //ENDBODY
-      cp_fin(component,CP_ARRET);
+      //cp_fin(component,CP_ARRET);
     }
   catch ( const CalciumException & ex)
     {
       std::cerr << ex.what() << std::endl;
-      cp_fin(component,CP_ARRET);
+      //cp_fin(component,CP_ARRET);
       SALOME::ExceptionStruct es;
       es.text=CORBA::string_dup(ex.what());
       es.type=SALOME::INTERNAL_ERROR;
@@ -331,7 +331,7 @@ ${body}
     }
   catch ( const SALOME_Exception & ex)
     {
-      cp_fin(component,CP_ARRET);
+      //cp_fin(component,CP_ARRET);
       SALOME::ExceptionStruct es;
       es.text=CORBA::string_dup(ex.what());
       es.type=SALOME::INTERNAL_ERROR;
@@ -339,7 +339,7 @@ ${body}
     }
   catch ( const SALOME::SALOME_Exception & ex)
     {
-      cp_fin(component,CP_ARRET);
+      //cp_fin(component,CP_ARRET);
       throw;
     }
   catch (...)
@@ -348,7 +348,7 @@ ${body}
 #if ${exe}
       _exit(-1);
 #endif
-      cp_fin(component,CP_ARRET);
+      //cp_fin(component,CP_ARRET);
       SALOME::ExceptionStruct es;
       es.text=CORBA::string_dup(" unknown exception");
       es.type=SALOME::INTERNAL_ERROR;