fix conflict

[tools/medcoupling.git] / src / MEDLoader / MEDFileMeshReadSelector.hxx

diff --git a/src/MEDLoader/MEDFileMeshReadSelector.hxx b/src/MEDLoader/MEDFileMeshReadSelector.hxx
index 15ac3ad6ad46d5113620ce8c670ad8b74f0c64fc..2a90b7dc0f2470ac3cf4dab4343f2e60dc72a4f8 100644 (file)
--- a/src/MEDLoader/MEDFileMeshReadSelector.hxx
+++ b/src/MEDLoader/MEDFileMeshReadSelector.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,10 +39,14 @@ namespace ParaMEDMEM
     bool isNodeFamilyFieldReading() const;
     bool isCellNameFieldReading() const;
     bool isNodeNameFieldReading() const;
+    bool isCellNumFieldReading() const;
+    bool isNodeNumFieldReading() const;
     void setCellFamilyFieldReading(bool b);
     void setNodeFamilyFieldReading(bool b);
     void setCellNameFieldReading(bool b);
     void setNodeNameFieldReading(bool b);
+    void setCellNumFieldReading(bool b);
+    void setNodeNumFieldReading(bool b);
     void reprAll(std::ostream& str) const;
   private:
     static std::string ReprStatus(bool v);
@@ -51,6 +55,8 @@ namespace ParaMEDMEM
     //bit #1 node family field
     //bit #2 cell name field
     //bit #3 node name field
+    //bit #4 cell num field
+    //bit #5 node num field
     unsigned int _code;
   };
 }