Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / src / StdMeshers / StdMeshers_Regular_1D.hxx

diff --git a/src/StdMeshers/StdMeshers_Regular_1D.hxx b/src/StdMeshers/StdMeshers_Regular_1D.hxx
index b02e21028ca105a94df59526151481cc92433248..e2695901bd94c6b67916996a035ba50c37c849a6 100644 (file)
--- a/src/StdMeshers/StdMeshers_Regular_1D.hxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.hxx
@@ -49,7 +49,7 @@ public:
                       const TopoDS_Shape& aShape);
 
   virtual const std::list <const SMESHDS_Hypothesis *> &
-    GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
+    GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, const bool=true);
 
   ostream & SaveTo(ostream & save);
   istream & LoadFrom(istream & load);
@@ -74,7 +74,7 @@ protected:
   enum IValueIndex {
     NB_SEGMENTS_IND  = 0,
     DISTR_TYPE_IND   = 1,
-    EXP_MODE_IND     = 2
+    CONV_MODE_IND     = 2
   };
 
   enum VValueIndex {