From: Gérald NICOLAS <gerald.nicolas@edf.fr>
Date: Tue, 9 Feb 2021 11:24:02 +0000 (+0100)
Subject: Merge branch 'master' into gni/adaptation
X-Git-Tag: V9_7_0a1~18^2~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ed49807f170bded5dffd1f25be7b8c5799cdab6b;p=modules%2Fsmesh.git

Merge branch 'master' into gni/adaptation
---

ed49807f170bded5dffd1f25be7b8c5799cdab6b
diff --cc src/SMESH_I/SMESH_Gen_i.hxx
index 08cfb22f7,c78d57bfd..fb16909b8
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@@ -468,10 -475,7 +468,7 @@@ public
  
    void CleanPythonTrace();
  
 -  int CountInPyDump(const TCollection_AsciiString& text);
 +  static int CountInPyDump(const TCollection_AsciiString& text);
-   SMESH::MG_ADAPT_ptr CreateMG_ADAPT();
-   SMESH::MG_ADAPT_ptr CreateAdaptationHypothesis();
-   SMESH::MG_ADAPT_OBJECT_ptr Adaptation( const char* adaptationType);
  
    // *****************************************
    // Internal methods