22787: [CEA 1320] Regression of test $SMESH_ROOT_DIR/bin/salome/SMESH_reg.py

Add namespace StdMeshers to StdMeshers_Distribution.* in order to avoid
clashing with FunctionExpr from paraview-4.2/libvtkvisitcommon-pv4.2.so.1

diff --git a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
index 0b7ac0235d3530dc63a1ff914afe938703dfb672..b2e15df8c1a8ec1f5d5b9b782f800150c3047a97 100644 (file)
--- a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
+++ b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
@@ -329,7 +329,7 @@ void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double    x0,
   coords.clear();
   for ( size_t i = 0; i < spaceFuns.size(); ++i )
   {
   coords.clear();
   for ( size_t i = 0; i < spaceFuns.size(); ++i )
   {

-    FunctionExpr fun( spaceFuns[i].c_str(), /*convMode=*/-1 );
+    StdMeshers::FunctionExpr fun( spaceFuns[i].c_str(), /*convMode=*/-1 );

 
     const double p0 = x0 * ( 1. - points[i])   + x1 * points[i];
     const double p1 = x0 * ( 1. - points[i+1]) + x1 * points[i+1];
 
     const double p0 = x0 * ( 1. - points[i])   + x1 * points[i];
     const double p1 = x0 * ( 1. - points[i+1]) + x1 * points[i+1];

diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx
index aa7ebf1f56ab7095aba68ffb4ec0b746de2fe5c7..3a0a7334ba579666a3e6b17f4f1d31f02098cabb 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/src/StdMeshers/StdMeshers_Distribution.cxx
@@ -43,6 +43,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+namespace StdMeshers {
+

 Function::Function( const int conv )
 : myConv( conv )
 {
 Function::Function( const int conv )
 : myConv( conv )
 {


@@ -345,3 +347,4 @@ bool buildDistribution( const Function& func, const double start, const double e
   data[nbSeg] = end;
   return true;
 }
   data[nbSeg] = end;
   return true;
 }

+}

diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx
index d5744d2dab1f4454549ce5a9f0614873e746714b..e974e95f7be5708fe4c81cf534d7ef1af1dff972 100644 (file)
--- a/src/StdMeshers/StdMeshers_Distribution.hxx
+++ b/src/StdMeshers/StdMeshers_Distribution.hxx
@@ -37,7 +37,8 @@
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 

-
+namespace StdMeshers
+{

 class STDMESHERS_EXPORT Function 
 {
 public:
 class STDMESHERS_EXPORT Function 
 {
 public:


@@ -114,5 +115,5 @@ bool buildDistribution( const TCollection_AsciiString& f, const int conv, const
 STDMESHERS_EXPORT
 bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end,
                         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, std::vector<double>& data, const double eps );

-
+}

 #endif
 #endif

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index f09dc7a10d1cf66ef59c211e80a592008b697b2d..c9e48b7e2d341a5ab0ed9c54ad7a2f96005d83ba 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@ -53,6 +53,7 @@
 
 #include <Basics_Utils.hxx>
 
 
 #include <Basics_Utils.hxx>
 

+using namespace StdMeshers;

 using namespace std;
 
 const double PRECISION = 1e-7;
 using namespace std;
 
 const double PRECISION = 1e-7;

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx
index cc964cfac209d603d8daf2111fc155f82f734529..a7e67cfeb6fc3c1e2db18cd06ef0acb49c57c714 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx
@@ -68,6 +68,7 @@
 #include <limits>
 
 using namespace std;
 #include <limits>
 
 using namespace std;

+using namespace StdMeshers;

 
 //=============================================================================
 /*!
 
 //=============================================================================
 /*!