Question for C++ export : Why getStudyServantVirtual method is requested ?

diff --git a/src/SMESH_I/SMESH_Gen_No_Session_i.cxx b/src/SMESH_I/SMESH_Gen_No_Session_i.cxx
index f7ec1b819e1e968979c140a39aef39687deb392e..4bf1abf392e2a756a403eef5254e774dda94b2eb 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_No_Session_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_No_Session_i.cxx
@@ -38,7 +38,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_No_Session_i::GetGeomEngine( bool isShaper )
   return myGeomGen;
 }
 
-SALOMEDS::Study_var SMESH_Gen_No_Session_i::getStudyServant() const
+SALOMEDS::Study_var SMESH_Gen_No_Session_i::getStudyServantVirtual() const
 {
   return SALOMEDS::Study::_duplicate(KERNEL::getStudyServantSA());
 }

diff --git a/src/SMESH_I/SMESH_Gen_No_Session_i.hxx b/src/SMESH_I/SMESH_Gen_No_Session_i.hxx
index 483c5d4d859dbaaff3b6ae009491bbe595b31c94..e79407dff8a7ed7869c0d3f8f9def01216e0cafc 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_No_Session_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_No_Session_i.hxx
@@ -30,6 +30,6 @@ public:
                const char*               instanceName,
                const char*               interfaceName);
   GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override;
-  SALOMEDS::Study_var getStudyServant() const override;
+  SALOMEDS::Study_var getStudyServantVirtual() const override;
   SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override;
 };

diff --git a/src/SMESH_I/SMESH_Gen_Session_i.cxx b/src/SMESH_I/SMESH_Gen_Session_i.cxx
index 13e1c59558d88d676280362b001fde1050a77737..f2577d7feb0e585cd240c0496154788837a5819e 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_Session_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_Session_i.cxx
@@ -38,7 +38,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_Session_i::GetGeomEngine( bool isShaper )
     return myGeomGen;
 }
 
-SALOMEDS::Study_var SMESH_Gen_Session_i::getStudyServant() const
+SALOMEDS::Study_var SMESH_Gen_Session_i::getStudyServantVirtual() const
 {
   return SALOMEDS::Study::_duplicate(KERNEL::getStudyServant());
 }

diff --git a/src/SMESH_I/SMESH_Gen_Session_i.hxx b/src/SMESH_I/SMESH_Gen_Session_i.hxx
index 7971a9008feca2129714efa3eeeba84ba803eea5..af69571e823f93eefb2f00a98429da7e8475b288 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_Session_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_Session_i.hxx
@@ -31,6 +31,6 @@ public:
                const char*               interfaceName);
   GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override;
   // Get the SALOMEDS::Study from naming service
-  SALOMEDS::Study_var getStudyServant() const override;
+  SALOMEDS::Study_var getStudyServantVirtual() const override;
   SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override;
 };

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 8a4309dbbc951e5f9c2a6619298e1fbb3d5c8e76..c78d57bfd9b8f99c9e9b05bfcf5a06851e78fc4e 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -108,10 +108,11 @@ public:
   // Get SALOME_LifeCycleCORBA object
   static SALOME_LifeCycleCORBA* GetLCC();
   // Retrieve and get GEOM engine reference
-  virtual GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) = 0;
   static GEOM::GEOM_Gen_var GetGeomEngine( GEOM::GEOM_Object_ptr );
   // Retrieve Study depending on Session / Standalone mode
-  virtual SALOMEDS::Study_var getStudyServant() const = 0;
+  virtual GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) = 0;
+  SALOMEDS::Study_var getStudyServant() const { return this->getStudyServantVirtual(); }
+  virtual SALOMEDS::Study_var getStudyServantVirtual() const = 0 ;
   virtual SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const = 0;
   SALOMEDS::SObject_ptr publish(CORBA::Object_ptr     theIOR,
                                 SALOMEDS::SObject_ptr theFatherObject,