From 0eb02fa883ba08324b667a4e0bc2831f13c17885 Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Wed, 13 Jan 2021 11:58:20 +0100
Subject: [PATCH] WIP

---
 src/SMESH_I/SMESH_Gen_i_1.cxx  | 3 ++-
 src/SMESH_SWIG/SMeshHelper.cxx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 8f6077ca9..b7e042125 100644
--- 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 06ab867ec..2c8d4bc5a 100644
--- 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};
-- 
2.39.2