Merge changes from 'master' branch.

[samples/component.git] / src / SIGNALSComponent / SIGNALSComponent_CheckOfUndefined.cxx

diff --git a/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx b/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx
index 02a870587f48b4af845e72a527eb1b32c44b44ff..0f97f6bd3ba2ea47111f66dfb07f77ad44b02010 100644 (file)
--- a/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx
+++ b/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx
@@ -1,36 +1,36 @@
-//  SALOME Container : implementation of container and engine for Kernel
+// Copyright (C) 2007-2016  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  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SALOME Container : implementation of container and engine for Kernel
 //  File   : SALOME_Container.cxx
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
 //  Module : SALOME
 //  $Header$
-
+//
 #include <iostream>
 #include <string>
 #include <stdio.h>
 
-#ifndef WNT
+#ifndef WIN32
 #include <unistd.h>
 #else
 #include <process.h>
@@ -50,12 +50,30 @@
 #include <mpi.h>
 #endif
 
+//CCRT
+#include <sstream>
+#include <time.h>
+#ifndef WIN32
+#include <sys/time.h>
+#include <sys/stat.h>
+#endif
+//end-CCRT
+
 #include "Container_init_python.hxx"
 
 using namespace std;
 
 extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB);
 
+
+#if PY_VERSION_HEX < 0x03050000
+static wchar_t*
+Py_DecodeLocale(const char *arg, size_t *size)
+{
+    return _Py_char2wchar(arg, size);
+}
+#endif
+
 int main(int argc, char* argv[])
 {
 #ifdef HAVE_MPI2
@@ -69,7 +87,7 @@ int main(int argc, char* argv[])
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
   CORBA::ORB_var orb = init(0 , 0 ) ;
          
-  SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
+  //SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
   INFOS_COMPILATION;
   BEGIN_OF(argv[0]);
 
@@ -86,8 +104,12 @@ int main(int argc, char* argv[])
     }
   else
     {
+      wchar_t **changed_argv = new wchar_t*[argc];
+      for (int i = 0; i < argc; i++) {
+       changed_argv[i] = Py_DecodeLocale(argv[i], NULL);
+      }
       Py_Initialize() ;
-      PySys_SetArgv( argc , argv ) ;
+      PySys_SetArgv( argc , changed_argv ) ;
     }
     
   char *containerName = "";
@@ -153,7 +175,7 @@ int main(int argc, char* argv[])
 #endif
 
   END_OF(argv[0]);
-  delete myThreadTrace;
+  // delete myThreadTrace;
   return 0 ;
 }