X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriver%2FDriver_Mesh.h;h=53a495de817a7669c67a72fac54299d708565ede;hb=b1f58b701eb4ec6fb4a14b070041f2c89e44723c;hp=fcaea2b3e6f0e54c4206aa30ee91d9a82ad918bb;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66;p=modules%2Fsmesh.git diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h index fcaea2b3e..53a495de8 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-2014 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 @@ -32,7 +32,7 @@ #include #include -#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;