From 2c0f1e8dff09b62efcc339c01bac2604254ae063 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 23 Feb 2021 15:16:10 +0100 Subject: [PATCH] Duplication of code preventing SHAPER module to work in SSL mode --- src/SalomeApp/SalomeApp_Engine_i.cxx | 5 ++--- src/SalomeApp/SalomeApp_Engine_i.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx index 4f5a82f00..cc3742d7c 100644 --- a/src/SalomeApp/SalomeApp_Engine_i.cxx +++ b/src/SalomeApp/SalomeApp_Engine_i.cxx @@ -366,10 +366,9 @@ PortableServer::POA_var SalomeApp_Engine_i::poa() /*! \return */ -SALOME_NamingService* SalomeApp_Engine_i::namingService() +SALOME_NamingService_Abstract* SalomeApp_Engine_i::namingService() { - static SALOME_NamingService _ns(orb()); - return &_ns; + return SalomeApp_Application::namingService(); } /*! diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h index 2b4137a52..9de78b810 100644 --- a/src/SalomeApp/SalomeApp_Engine_i.h +++ b/src/SalomeApp/SalomeApp_Engine_i.h @@ -38,7 +38,7 @@ #include #include CORBA_SERVER_HEADER(SalomeApp_Engine) -class SALOME_NamingService; +class SALOME_NamingService_Abstract; class SALOMEAPP_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine, public Engines_Component_i @@ -99,7 +99,7 @@ public: private: static CORBA::ORB_var orb(); static PortableServer::POA_var poa(); - static SALOME_NamingService* namingService(); + static SALOME_NamingService_Abstract* namingService(); private: MapOfFiles myListOfFiles; bool myKeepFiles; -- 2.39.2