updated copyright message

[modules/kernel.git] / src / Communication_SWIG / libSALOME_Comm.i

diff --git a/src/Communication_SWIG/libSALOME_Comm.i b/src/Communication_SWIG/libSALOME_Comm.i
index a26e36ca66b7ea2ed6a75e8f3ca9ad29bd248867..ba0d6b14b754f80447df2a36b1e5f62d2b1e3fd9 100644 (file)
--- a/src/Communication_SWIG/libSALOME_Comm.i
+++ b/src/Communication_SWIG/libSALOME_Comm.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,13 +30,14 @@
   #include "SALOME_Comm_i.hxx"
   #include "SALOMEMultiComm.hxx"
   #include "SenderFactory.hxx"
+  #include "OpUtil.hxx"
 %}
 
-%typemap(python,in) SALOME::SenderDouble_ptr
+%typemap(in) SALOME::SenderDouble_ptr
 {
   PyObject* pdict = PyDict_New();
   PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-  PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+  PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
  
   PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
@@ -53,20 +54,17 @@
  
   // Ask omniORB to convert IOR string to SALOME::SenderDouble_ptr
 
-  int argc = 0;
-  char *xargv = (char*)"";
-  char **argv = &xargv;
-  CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+  CORBA::ORB_var ORB = KERNEL::GetRefToORB();
   CORBA::Object_var O =  ORB->string_to_object(s);
   SALOME::SenderDouble_ptr t = SALOME::SenderDouble::_narrow(O);
   $1 = t;
 }
 
-%typemap(python,in) SALOME::SenderInt_ptr
+%typemap(in) SALOME::SenderInt_ptr
 {
   PyObject* pdict = PyDict_New();
   PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-  PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+  PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
  
   PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
@@ -83,46 +81,37 @@
  
   // Ask omniORB to convert IOR string to SALOME::SenderInt_ptr
 
-  int argc = 0;
-  char *xargv = (char*)"";
-  char **argv = &xargv;
-  CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+  CORBA::ORB_var ORB = KERNEL::GetRefToORB();
   CORBA::Object_var O =  ORB->string_to_object(s);
   SALOME::SenderInt_ptr t = SALOME::SenderInt::_narrow(O);
   $1 = t;
 }
 
-%typemap(python,out) SALOME::SenderDouble_ptr
+%typemap(out) SALOME::SenderDouble_ptr
 {  
    PyObject* pdict = PyDict_New();
    PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-   PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+   PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
    PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
    PyObject* orb = PyDict_GetItemString(pdict, "o");
    // Get the orb Corba C++
-   int argc = 0;
-   char *xargv = (char*)"";
-   char **argv = &xargv;
-   CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+   CORBA::ORB_var ORB = KERNEL::GetRefToORB();
    std::string s =  ORB->object_to_string($1);
    PyObject * tmp = PyString_FromString(s.c_str());
    $result = PyObject_CallMethod(orb, (char*)"string_to_object", (char*)"O", tmp);
 }
 
-%typemap(python,out) SALOME::SenderInt_ptr
+%typemap(out) SALOME::SenderInt_ptr
 {  
    PyObject* pdict = PyDict_New();
    PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-   PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+   PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
    PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
    PyObject* orb = PyDict_GetItemString(pdict, "o");
    // Get the orb Corba C++
-   int argc = 0;
-   char *xargv = (char*)"";
-   char **argv = &xargv;
-   CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+   CORBA::ORB_var ORB = KERNEL::GetRefToORB();
    std::string s =  ORB->object_to_string($1);
    PyObject * tmp = PyString_FromString(s.c_str());
    $result = PyObject_CallMethod(orb, (char*)"string_to_object", (char*)"O", tmp);