WIP

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 8f6077ca98c4a86b6dd26d699de7461ed2801987..b7e0421256f4ee578200563202aab74f5dee38d3 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -40,6 +40,7 @@
 #include <Utils_ExceptHandlers.hxx>
 #include <SALOMEDS_wrap.hxx>
 #include <SALOMEDS_Attributes_wrap.hxx>
+#include "SALOMEDS_Study_i.hxx"
 #include <SALOME_KernelServices.hxx>
 
 #include <TCollection_AsciiString.hxx>
@@ -215,7 +216,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::ObjectToSObject(CORBA::Object_ptr theObject)
 //=======================================================================
 SALOMEDS::Study_var SMESH_Gen_i::getStudyServant()
 {
-  return SALOMEDS::Study::_duplicate(KERNEL::getStudyServant());
+  return SALOMEDS::Study::_duplicate(KERNEL::getStudyServantSA());
 }
 
 //=======================================================================

diff --git a/src/SMESH_SWIG/SMeshHelper.cxx b/src/SMESH_SWIG/SMeshHelper.cxx
index 06ab867eca57dfc94d2558813ab5721544f69bcf..2c8d4bc5ad8b9fae8281b7cba3b4cf797a1a7715 100644 (file)
--- a/src/SMESH_SWIG/SMeshHelper.cxx
+++ b/src/SMESH_SWIG/SMeshHelper.cxx
@@ -32,6 +32,7 @@ std::string BuildSMESHInstance()
     CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
     PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
     PortableServer::POAManager_var pman = poa->the_POAManager();
+    PortableServer::ObjectId_var conId;
     //
     {
         char *argv[4] = {"Container","FactoryServer","toto",nullptr};