-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// Author: Guillaume Boulant (EDF/R&D)
-#ifndef __KERNEL_SERVICES_H__
-#define __KERNEL_SERVICES_H__
+// Author: Guillaume Boulant (EDF/R&D)
+#ifndef __SALOME_KERNEL_SERVICES_HXX__
+#define __SALOME_KERNEL_SERVICES_HXX__
+#pragma once
#include "KernelHelpers.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
+#include "SALOME_KernelORB.hxx"
+
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::StudyManager_ptr getStudyManager();
+ KERNELHELPERS_EXPORT SALOMEDS::Study_ptr getStudyServant();
KERNELHELPERS_EXPORT Engines::SalomeLauncher_ptr getSalomeLauncher();
KERNELHELPERS_EXPORT Engines::ResourcesManager_ptr getResourcesManager();
// SALOME KERNEL services to deal with a SALOME study, SObject and
// SComponent.
//
- KERNELHELPERS_EXPORT SALOMEDS::Study_ptr getStudyById(int aStudyId);
- KERNELHELPERS_EXPORT int getStudyId(SALOMEDS::Study_ptr study);
KERNELHELPERS_EXPORT CORBA::Object_ptr IORToObject(char * IOR);
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
// 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__