Merge from V6_main_20120808 08Aug12

[modules/med.git] / src / ParaMEDMEM / ExplicitCoincidentDEC.hxx

diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx
index 3eb131c019e89733732d7249c64f8a568ba5db56..d8597c4d0b8ff988ef1f95376b9a1d1e1f5d6efd 100644 (file)
--- a/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx
+++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx
@@ -1,25 +1,26 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2007-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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __EXPLICITCOINCIDENTDEC_HXX__
 #define __EXPLICITCOINCIDENTDEC_HXX__
 
-#include "DEC.hxx"
+#include "DisjointDEC.hxx"
 #include "ExplicitMapping.hxx"
 #include "ExplicitTopology.hxx"
 
@@ -29,7 +30,7 @@ namespace ParaMEDMEM
 {
   class BlockTopology;
 
-  class ExplicitCoincidentDEC : public DEC
+  class ExplicitCoincidentDEC : public DisjointDEC
   {
   public:
     ExplicitCoincidentDEC();