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
Compilation under Windows: add missing header
[modules/kernel.git]
/
src
/
ParallelContainer
/
SALOME_ParallelContainerProxy_i.cxx
diff --git
a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
index 34abc371677804083ab33caa18a4a6ad7521f611..23be1c6c040d65bd15f1f6bd06aa6a904bb74375 100644
(file)
--- a/
src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
+++ b/
src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-69,7
+69,7
@@
Container_proxy_impl_final:: ~Container_proxy_impl_final() {
if (_NS)
delete _NS;
if (_NS)
delete _NS;
- // _fab_thread not deleted be
a
cause fab_thread is managed
+ // _fab_thread not deleted because fab_thread is managed
// by paco_fabrique_manager
}
// by paco_fabrique_manager
}
@@
-216,7
+216,7
@@
Container_proxy_impl_final::load_component_Library(const char* componentName, CO
PyObject *result = PyObject_CallMethod(pyCont,
(char*)"import_component",
(char*)"s",componentName);
PyObject *result = PyObject_CallMethod(pyCont,
(char*)"import_component",
(char*)"s",componentName);
- std::string ret_p= Py
String_AsString
(result);
+ std::string ret_p= Py
Unicode_AsUTF8
(result);
Py_XDECREF(result);
Py_RELEASE_NEW_THREAD;
Py_XDECREF(result);
Py_RELEASE_NEW_THREAD;
@@
-350,7
+350,7
@@
Container_proxy_impl_final::create_component_instance_env(const char* componentN
string instanceName = aCompName + "_inst_" + aNumI ;
string component_registerName = _containerName + "/" + instanceName;
string instanceName = aCompName + "_inst_" + aNumI ;
string component_registerName = _containerName + "/" + instanceName;
- // --- Instan
c
iate required CORBA object
+ // --- Instan
t
iate required CORBA object
Container_proxy_impl_final::proxy_object * proxy = new Container_proxy_impl_final::proxy_object();
proxy->proxy_id = (component_proxy_factory) (_orb,
Container_proxy_impl_final::proxy_object * proxy = new Container_proxy_impl_final::proxy_object();
proxy->proxy_id = (component_proxy_factory) (_orb,
@@
-386,7
+386,7
@@
Container_proxy_impl_final::create_component_instance_env(const char* componentN
}
catch (...)
{
}
catch (...)
{
- INFOS( "Exception ca
tched
in Proxy creation" );
+ INFOS( "Exception ca
ught
in Proxy creation" );
return Engines::EngineComponent::_nil();
}
return Engines::EngineComponent::_nil();
}