X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Distribution.hxx;h=261d702645b1913813ddf1f284179501b5c6e657;hp=d1eabb5d0a56d3d04a793502174c7acbc78d23d5;hb=3da8fefe9c957f4538e9eacf013ce678df4d6c91;hpb=6b471bcc54cbeb90f0d977323db8c76d3d2cce09

diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx
index d1eabb5d0..261d70264 100644
--- a/src/StdMeshers/StdMeshers_Distribution.hxx
+++ b/src/StdMeshers/StdMeshers_Distribution.hxx
@@ -1,42 +1,45 @@
-//  SMESH StdMeshers : implementaion of point distribution algorithm
+// Copyright (C) 2007-2015  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
+//
+// 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.
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SMESH StdMeshers : implementaion of point distribution algorithm
 //  File   : StdMeshers_Distribution.hxx
 //  Author : Alexandre SOLOVYOV
 //  Module : SMESH
 //  $Header$
-
+//
 #ifndef _STD_MESHERS_DISTRIBUTION_HXX_
 #define _STD_MESHERS_DISTRIBUTION_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include <vector>
 #include <math_Function.hxx>
 #include <ExprIntrp_GenExp.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
-
-class Function 
+namespace StdMeshers
+{
+class STDMESHERS_EXPORT Function 
 {
 public:
   Function( const int );
@@ -48,7 +51,7 @@ private:
   int myConv;
 };
 
-class FunctionIntegral : public Function
+class STDMESHERS_EXPORT FunctionIntegral : public Function
 {
 public:
   FunctionIntegral( const Function*, const double );
@@ -61,7 +64,7 @@ private:
   double    myStart;
 };
 
-class FunctionTable : public Function
+class STDMESHERS_EXPORT FunctionTable : public Function
 {
 public:
   FunctionTable( const std::vector<double>&, const int );
@@ -84,12 +87,12 @@ private:
   std::vector<double>  myData;
 };
 
-class FunctionExpr : public Function, public math_Function
+class STDMESHERS_EXPORT FunctionExpr : public Function, public math_Function
 {
 public:
   FunctionExpr( const char*, const int );
   virtual ~FunctionExpr();
-  virtual Standard_Boolean Value( Standard_Real, Standard_Real& );
+  virtual Standard_Boolean Value( const Standard_Real, Standard_Real& );
   virtual bool   value( const double, double& ) const;
   virtual double integral( const double, const double ) const;
 
@@ -99,15 +102,18 @@ private:
   TColStd_Array1OfReal        myValues;
 };
 
+STDMESHERS_EXPORT
 bool buildDistribution( const Function& f,
-		        const double start, const double end,
-		        const int nbSeg,
-		        vector<double>& data,
-		        const double eps );
+                        const double start, const double end,
+                        const int nbSeg,
+                        std::vector<double>& data,
+                        const double eps );
 
+STDMESHERS_EXPORT
 bool buildDistribution( const TCollection_AsciiString& f, const int conv, const double start, const double end,
-		        const int nbSeg, vector<double>& data, const double eps );
+                        const int nbSeg, std::vector<double>& data, const double eps );
+STDMESHERS_EXPORT
 bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end,
-		        const int nbSeg, vector<double>& data, const double eps );
-
+                        const int nbSeg, std::vector<double>& data, const double eps );
+}
 #endif