X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriver%2FDriver_Mesh.h;h=164be49132590f477f3825a2eba412fe0e9fd466;hp=fcaea2b3e6f0e54c4206aa30ee91d9a82ad918bb;hb=8af480d8934d988fbefe45f08ffd868d43f7cf28;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66

diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index fcaea2b3e..164be4913 100644
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // 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
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH Driver : implementaion of driver for reading and writing  
+//  SMESH Driver : implementation of driver for reading and writing
 //  File   : Mesh_Reader.h
 //  Module : SMESH
 //
@@ -32,7 +32,7 @@
 #include <string>
 #include <vector>
 
-#ifdef WNT
+#ifdef WIN32
  #if defined MESHDRIVER_EXPORTS || defined MeshDriver_EXPORTS
   #define MESHDRIVER_EXPORT __declspec( dllexport )
  #else
@@ -54,11 +54,12 @@ class MESHDRIVER_EXPORT Driver_Mesh
     DRS_WARN_RENUMBER,  // a file has overlapped ranges of element numbers,
                         // so the numbers from the file are ignored
     DRS_WARN_SKIP_ELEM, // some elements were skipped due to incorrect file data
+    DRS_WARN_DESCENDING, // some elements were skipped due to descending connectivity
     DRS_FAIL            // general failure (exception etc.)
   };
 
   void                SetMeshId(int theMeshId);
-  void                SetFile(const std::string& theFileName);
+  virtual void        SetFile(const std::string& theFileName);
   virtual void        SetMeshName(const std::string& theMeshName);
   virtual std::string GetMeshName() const;
 
@@ -74,6 +75,8 @@ class MESHDRIVER_EXPORT Driver_Mesh
   std::string myMeshName;
   int         myMeshId;
 
+  static std::string fixUTF8(const std::string & s );
+
   Status addMessage(const std::string& msg, const bool isFatal=false);
   std::vector< std::string > myErrorMessages;
   Status                     myStatus;