Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / ParallelContainer / Parallel_Salome_file_i.hxx

diff --git a/src/ParallelContainer/Parallel_Salome_file_i.hxx b/src/ParallelContainer/Parallel_Salome_file_i.hxx
index 21384fef918d2823b6edc1b5f34da22b2cab639e..e689e76cfe2f97a72f57c83816ddca86afa465fc 100644 (file)
--- a/src/ParallelContainer/Parallel_Salome_file_i.hxx
+++ b/src/ParallelContainer/Parallel_Salome_file_i.hxx
@@ -1,28 +1,30 @@
-// Copyright (C) 2007  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA 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
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// 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
 //
+
 //  File   : Parallel_Salome_file_i.hxx
 //  Author : André RIBES, EDF
 //  Module : SALOME
 //  $Header: 
-
+//
 #ifndef _PARALLEL_SALOME_FILE_I_HXX_
 #define _PARALLEL_SALOME_FILE_I_HXX_
 
@@ -31,7 +33,7 @@
 #include <map>
 #include <cstdio>
 
-#include "SALOME_ComponentPaCO_Engines_Parallel_Salome_file_server.h"
+#include "SALOME_PACOExtensionPaCO_Engines_Parallel_Salome_file_server.hxx"
 #include "Salome_file_i.hxx"
 
 class CONTAINER_EXPORT Parallel_Salome_file_i:
@@ -40,8 +42,8 @@ class CONTAINER_EXPORT Parallel_Salome_file_i:
 {
   public:
     Parallel_Salome_file_i(CORBA::ORB_ptr orb, 
-                          const char * ior,
-                          int rank);
+                           const char * ior,
+                           int rank);
     virtual ~Parallel_Salome_file_i();
 
     virtual void setFileNode(const char* file_name, CORBA::Long node);
@@ -55,9 +57,9 @@ class CONTAINER_EXPORT Parallel_Salome_file_i:
     virtual void save_all(const char* hdf5_file);
     virtual void connect(Engines::Salome_file_ptr source_Salome_file);
     virtual void connectDistributedFile(const char * file_name,
-                                       Engines::Salome_file_ptr source_Salome_file);
+                                        Engines::Salome_file_ptr source_Salome_file);
     virtual void setDistributedSourceFile(const char* file_name,
-                                         const char * source_file_name);
+                                          const char * source_file_name);
     virtual void recvFiles();
     virtual void recvFiles_node();
     virtual void setContainer(Engines::Container_ptr container);