Synchronize adm files

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

diff --git a/src/MEDLoader/MEDFileUtilities.hxx b/src/MEDLoader/MEDFileUtilities.hxx
old mode 100644 (file)
new mode 100755 (executable)
index 42fbcd2..fad58c7
--- a/src/MEDLoader/MEDFileUtilities.hxx
+++ b/src/MEDLoader/MEDFileUtilities.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  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.
+// 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
@@ -28,22 +28,22 @@
 
 namespace MEDFileUtilities
 {
-  med_access_mode TraduceWriteMode(int medloaderwritemode) throw(INTERP_KERNEL::Exception);
-  int TraduceFieldType(med_field_type ft) throw(INTERP_KERNEL::Exception);
-  void CheckMEDCode(int code, med_idt fid, const char *msg) throw(INTERP_KERNEL::Exception);
-  void CheckFileForRead(const char *fileName) throw(INTERP_KERNEL::Exception);
+  med_access_mode TraduceWriteMode(int medloaderwritemode);
+  const char *GetReadableMEDFieldType(med_field_type ft);
+  void CheckMEDCode(int code, med_idt fid, const std::string& msg);
+  void CheckFileForRead(const std::string& fileName);
 
   class AutoFid
   {
   public:
     AutoFid(med_idt fid);
-    operator med_idt() const;
+    operator med_idt() const { return _fid; }
     ~AutoFid();
   private:
     med_idt _fid;
   };
 }
-  
+
 namespace ParaMEDMEM
 {
   class MEDLOADER_EXPORT MEDFileWritable
@@ -51,10 +51,10 @@ namespace ParaMEDMEM
   public:
     MEDFileWritable();
     void copyOptionsFrom(const MEDFileWritable& other) const;
-    int getTooLongStrPolicy() const throw(INTERP_KERNEL::Exception);
-    void setTooLongStrPolicy(int newVal) throw(INTERP_KERNEL::Exception);
-    int getZipConnPolicy() throw(INTERP_KERNEL::Exception);
-    void setZipConnPolicy(int newVal) throw(INTERP_KERNEL::Exception);
+    int getTooLongStrPolicy() const;
+    void setTooLongStrPolicy(int newVal);
+    int getZipConnPolicy();
+    void setZipConnPolicy(int newVal);
   protected://policies on write
     mutable int _too_long_str;
     mutable int _zipconn_pol;