Merge from V6_main_20120808 08Aug12

[modules/homard.git] / src / HOMARD_I / HOMARD_Iteration_i.hxx

diff --git a/src/HOMARD_I/HOMARD_Iteration_i.hxx b/src/HOMARD_I/HOMARD_Iteration_i.hxx
index 79906e173d5ac5d2ffd723fd24e668e47bc7a59d..859032740583de915e1a674fe620d587ff54d068 100644 (file)
--- a/src/HOMARD_I/HOMARD_Iteration_i.hxx
+++ b/src/HOMARD_I/HOMARD_Iteration_i.hxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2011-2012  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #ifndef _HOMARD_ITERATION_I_HXX_
 #define _HOMARD_ITERATION_I_HXX_
 
@@ -5,17 +24,24 @@
 #include CORBA_SERVER_HEADER(HOMARD_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Iteration)
 
+#include "SALOME_Component_i.hxx"
+#include "SALOME_NamingService.hxx"
+#include "Utils_CorbaException.hxx"
+
 #include <string>
 
 class HOMARD_Iteration;
 
-class HOMARD_Iteration_i: public virtual POA_HOMARD::HOMARD_Iteration,
-                         public virtual PortableServer::ServantBase
-{ 
+class HOMARD_Iteration_i:
+  public virtual Engines_Component_i,
+  public virtual POA_HOMARD::HOMARD_Iteration,
+  public virtual PortableServer::ServantBase
+{
 public:
-  HOMARD_Iteration_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
+  HOMARD_Iteration_i( CORBA::ORB_ptr orb,
+                      HOMARD::HOMARD_Gen_var gen_i );
   HOMARD_Iteration_i();
-  
+
   virtual ~HOMARD_Iteration_i();
 
   void                   SetName( const char* NomIteration );
@@ -58,7 +84,7 @@ public:
   void                   SetHypoName( const char* NomHypo );
   char*                  GetHypoName();
 
-  CORBA::Boolean         Compute();
+  CORBA::Long            Compute(CORBA::Long etatMenage);
 
   std::string            Dump() const;
   bool                   Restore( const std::string& stream );