Kernel evolution for salome gui without neither NS nor other servers.

[modules/kernel.git] / src / KernelHelpers / SALOME_KernelServices.hxx

diff --git a/src/KernelHelpers/SALOME_KernelServices.hxx b/src/KernelHelpers/SALOME_KernelServices.hxx
index eecdc7efb02c7350023803fcd2f8036ed3fc7646..0651bda940834575af80e20bef489ce8310dad5d 100644 (file)
--- a/src/KernelHelpers/SALOME_KernelServices.hxx
+++ b/src/KernelHelpers/SALOME_KernelServices.hxx
@@ -18,9 +18,9 @@
 //
 
 // Author: Guillaume Boulant (EDF/R&D) 
-
-#ifndef __KERNEL_SERVICES_H__
-#define __KERNEL_SERVICES_H__
+#ifndef __SALOME_KERNEL_SERVICES_HXX__
+#define __SALOME_KERNEL_SERVICES_HXX__
+#pragma once
 
 #include "KernelHelpers.hxx"
 
@@ -39,7 +39,8 @@ namespace KERNEL {
   // ---------------------------------------------
   // SALOME KERNEL main services
   KERNELHELPERS_EXPORT CORBA::ORB_ptr                getORB();
-  KERNELHELPERS_EXPORT SALOME_NamingService *        getNamingService();
+  KERNELHELPERS_EXPORT SALOME_NamingService_Abstract *getNamingService();
+  KERNELHELPERS_EXPORT void assignNamingServiceSL();
   KERNELHELPERS_EXPORT SALOME_LifeCycleCORBA *       getLifeCycleCORBA();
   KERNELHELPERS_EXPORT SALOME::Session_ptr           getSalomeSession();
   KERNELHELPERS_EXPORT SALOMEDS::Study_ptr           getStudyServant();
@@ -54,7 +55,8 @@ namespace KERNEL {
   KERNELHELPERS_EXPORT CORBA::Object_ptr   SObjectToObject(SALOMEDS::SObject_ptr);
   
 
-
+  KERNELHELPERS_EXPORT void RegisterCompo(const std::string& compoName, CORBA::Object_var compoPtr);
+  KERNELHELPERS_EXPORT CORBA::Object_var RetrieveCompo(const std::string& compoName);
   /*!
    * This template function provides you with the servant (CORBA
    * object narrowed to its interface) corresponding to the specified
@@ -93,10 +95,12 @@ namespace KERNEL {
 // We can use the macros defined by SALOMELocalTrace/utilities.h
 #include "utilities.h"
 #define SALOMELOG(msg) {MESS_BEGIN("[XSALOME]") << msg << MESS_END}
+#ifdef LOG
+#undef LOG
+#endif
 #define LOG SALOMELOG
 
 #include "Utils_CorbaException.hxx"
 // Tip: CORBA exceptions can be used with LOG (or more generally in streams)
 // Ex: LOG("An exception occurs: "<<e) will log the data of the exception e
-
-#endif // KERNEL_SERVICES
+#endif //__SALOME_KERNEL_SERVICES_HXX__