Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0023366: [CEA 1972] Porting Salome to GCC 6
[modules/kernel.git]
/
src
/
Container
/
SALOME_Container_i.hxx
diff --git
a/src/Container/SALOME_Container_i.hxx
b/src/Container/SALOME_Container_i.hxx
index e07ed20a98cabe62ed460986bfb750dc54e8f8e5..197d0def95f49a37db0c8bfb496e1d5f6be97b89 100644
(file)
--- a/
src/Container/SALOME_Container_i.hxx
+++ b/
src/Container/SALOME_Container_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-30,6
+30,7
@@
#define _SALOME_CONTAINER_I_HXX_
#include "SALOME_Container.hxx"
#define _SALOME_CONTAINER_I_HXX_
#include "SALOME_Container.hxx"
+#include "Utils_Mutex.hxx"
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SALOME_Component)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SALOME_Component)
@@
-75,7
+76,12
@@
public:
create_component_instance_env( const char* componentName,
CORBA::Long studyId, // 0 for multiStudy
const Engines::FieldsDict& env,
create_component_instance_env( const char* componentName,
CORBA::Long studyId, // 0 for multiStudy
const Engines::FieldsDict& env,
- CORBA::String_out reason);
+ CORBA::String_out reason);
+
+ virtual char *
+ create_python_service_instance(const char* CompName,
+ CORBA::String_out reason);
+
Engines::EngineComponent_ptr
find_component_instance( const char* registeredName,
CORBA::Long studyId); // 0 for multiStudy
Engines::EngineComponent_ptr
find_component_instance( const char* registeredName,
CORBA::Long studyId); // 0 for multiStudy
@@
-106,9
+112,9
@@
public:
virtual Engines::Salome_file_ptr createSalome_file(const char* origFileName);
void copyFile(Engines::Container_ptr container, const char* remoteFile, const char* localFile);
Engines::PyNode_ptr createPyNode(const char* nodeName, const char* code);
virtual Engines::Salome_file_ptr createSalome_file(const char* origFileName);
void copyFile(Engines::Container_ptr container, const char* remoteFile, const char* localFile);
Engines::PyNode_ptr createPyNode(const char* nodeName, const char* code);
- Engines::PyNode_ptr getDefaultPyNode();
+ Engines::PyNode_ptr getDefaultPyNode(
const char *nodeName
);
Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code);
Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code);
- Engines::PyScriptNode_ptr getDefaultPyScriptNode();
+ Engines::PyScriptNode_ptr getDefaultPyScriptNode(
const char *nodeName
);
// --- local C++ methods
Engines::EngineComponent_ptr
// --- local C++ methods
Engines::EngineComponent_ptr
@@
-156,8
+162,9
@@
protected:
std::map<std::string,Engines::EngineComponent_var> _listInstances_map;
std::map<std::string,Engines::fileRef_var> _fileRef_map;
std::map<std::string,Engines::Salome_file_var> _Salome_file_map;
std::map<std::string,Engines::EngineComponent_var> _listInstances_map;
std::map<std::string,Engines::fileRef_var> _fileRef_map;
std::map<std::string,Engines::Salome_file_var> _Salome_file_map;
- Engines::PyScriptNode_var _dftPyScriptNode;
- Engines::PyNode_var _dftPyNode;
+ std::map<std::string,Engines::PyScriptNode_var> _dftPyScriptNode;
+ std::map<std::string,Engines::PyNode_var> _dftPyNode;
+ Utils_Mutex _mutexForDftPy;
std::list<std::string> _tmp_files;
Engines::fileTransfer_var _fileTransfer;
std::list<std::string> _tmp_files;
Engines::fileTransfer_var _fileTransfer;