ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 18:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Add namespace StdMeshers to StdMeshers_Distribution.* in order to avoid
clashing with FunctionExpr from paraview-4.2/libvtkvisitcommon-pv4.2.so.1
This commit is contained in:
eap 2014-10-17 21:16:35 +04:00
parent f34d4ca343
commit 54f2672f6a
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/StdMeshers/StdMeshers_CartesianParameters3D.cxx
View File

@ -329,7 +329,7 @@ void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double x0,
coords.clear(); coords.clear();
for ( size_t i = 0; i < spaceFuns.size(); ++i ) 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 p0 = x0 * ( 1. - points[i]) + x1 * points[i];
const double p1 = x0 * ( 1. - points[i+1]) + x1 * points[i+1]; const double p1 = x0 * ( 1. - points[i+1]) + x1 * points[i+1];

3
src/StdMeshers/StdMeshers_Distribution.cxx
View File

@ -43,6 +43,8 @@
using namespace std; using namespace std;
namespace StdMeshers {
Function::Function( const int conv ) Function::Function( const int conv )
: myConv( conv ) : myConv( conv )
{ {
@ -345,3 +347,4 @@ bool buildDistribution( const Function& func, const double start, const double e
data[nbSeg] = end; data[nbSeg] = end;
return true; return true;
} }
}

5
src/StdMeshers/StdMeshers_Distribution.hxx
View File

@ -37,7 +37,8 @@
#include <Expr_Array1OfNamedUnknown.hxx> #include <Expr_Array1OfNamedUnknown.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
namespace StdMeshers
{
class STDMESHERS_EXPORT Function class STDMESHERS_EXPORT Function
{ {
public: public:
@ -114,5 +115,5 @@ bool buildDistribution( const TCollection_AsciiString& f, const int conv, const
STDMESHERS_EXPORT STDMESHERS_EXPORT
bool buildDistribution( const std::vector<double>& f, const int conv, const double start, const double end, 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 ); const int nbSeg, std::vector<double>& data, const double eps );
}
#endif #endif

1
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
View File

@ -53,6 +53,7 @@
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
using namespace StdMeshers;
using namespace std; using namespace std;
const double PRECISION = 1e-7; const double PRECISION = 1e-7;

1
src/StdMeshers/StdMeshers_Regular_1D.cxx
View File

@ -68,6 +68,7 @@
#include <limits> #include <limits>
using namespace std; using namespace std;
using namespace StdMeshers;
//============================================================================= //=============================================================================
/*! /*!