X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCKPlugin%2FHEXABLOCKPlugin_Hypothesis.hxx;h=2d452bafca557b54c206f96d6057d7f181a6d5fa;hb=1a8bde22be2ffdd748b725809f3f4672dc85386c;hp=63d514b4900b290411e6084f7e058190e06bb58c;hpb=a1d6d7c1df5f43c08dd89e843ebca7ec0d8446a9;p=plugins%2Fhexablockplugin.git diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx old mode 100755 new mode 100644 index 63d514b..2d452ba --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2009-2013 CEA/DEN, EDF R&D +// Copyright (C) 2009-2021 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 @@ -36,11 +36,11 @@ #include #include -class HEXABLOCKPLUGIN_EXPORT HEXABLOCKPlugin_Hypothesis: public SMESH_Hypothesis +class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_Hypothesis: public SMESH_Hypothesis { public: - HEXABLOCKPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen); + HEXABLOCKPlugin_Hypothesis(int hypId, SMESH_Gen * gen); /*! * Define the document to be meshed, mandatory @@ -50,7 +50,7 @@ public: // void SetDocument(HEXA_NS::Document* doc); .. replaced by : void SetDocument (cpchar name); void SetXmlFlow (cpchar xml); - char* GetXmlFlow () const; + cpchar GetXmlFlow () const; /*! * To define the hight dimension to generated: 3 = hexas, 2 = quads, 1 = segments, 0 = nodes @@ -61,8 +61,8 @@ public: // Persistence virtual std::ostream & SaveTo(std::ostream & save); virtual std::istream & LoadFrom(std::istream & load); - friend HEXABLOCKPLUGIN_EXPORT std::ostream & operator <<(std::ostream & save, HEXABLOCKPlugin_Hypothesis & hyp); - friend HEXABLOCKPLUGIN_EXPORT std::istream & operator >>(std::istream & load, HEXABLOCKPlugin_Hypothesis & hyp); + friend HEXABLOCKPLUGINENGINE_EXPORT std::ostream & operator <<(std::ostream & save, HEXABLOCKPlugin_Hypothesis & hyp); + friend HEXABLOCKPLUGINENGINE_EXPORT std::istream & operator >>(std::istream & load, HEXABLOCKPlugin_Hypothesis & hyp); /*! * \brief Does nothing