Rollback bad correction of bug EDF8655 (commit 66b873ce0f613b5ab34b739a9e179d3f8b094...

[tools/medcoupling.git] / src / ParaMEDMEM / ICoCoField.hxx

diff --git a/src/ParaMEDMEM/ICoCoField.hxx b/src/ParaMEDMEM/ICoCoField.hxx
index b2436fde4411b3277b484bc79039c2c932d353c1..ce8e24adeea7e7a57fe0ada51c064414d27be500 100644 (file)
--- a/src/ParaMEDMEM/ICoCoField.hxx
+++ b/src/ParaMEDMEM/ICoCoField.hxx
@@ -1,23 +1,28 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2014  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, 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
-//  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 __ICOCOFIELD_HXX__
-#define __ICOCOFIELD_HXX__
+
+// ICoCo file common to several codes
+// ICoCoField.h
+// version 1.2 10/05/2010
+
+#ifndef _ICoCoField_included_
+#define _ICoCoField_included_
 
 #include <string>
 
@@ -26,11 +31,12 @@ namespace ICoCo
   class Field
   {
   public:
-    Field() { }
-    virtual ~Field() { }
-    void setName(const std::string& name) { _name=name; }
-    std::string getName() const { return _name; }
-  protected:
+    Field();
+    virtual ~Field();
+    void setName(const std::string& name);
+    const std::string& getName() const;
+    const char *getCharName() const;
+  private:
     std::string _name;
   };
 }