Salome HOME
projects
/
samples
/
component.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a98483d1e27e28fdf5de9a3b47b6ba4e45029644..0f97f6bd3ba2ea47111f66dfb07f77ad44b02010 100644
(file)
--- a/
src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx
+++ b/
src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-30,7
+30,7
@@
#include <string>
#include <stdio.h>
#include <string>
#include <stdio.h>
-#ifndef W
NT
+#ifndef W
IN32
#include <unistd.h>
#else
#include <process.h>
#include <unistd.h>
#else
#include <process.h>
@@
-53,8
+53,10
@@
//CCRT
#include <sstream>
#include <time.h>
//CCRT
#include <sstream>
#include <time.h>
+#ifndef WIN32
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/stat.h>
+#endif
//end-CCRT
#include "Container_init_python.hxx"
//end-CCRT
#include "Container_init_python.hxx"
@@
-63,6
+65,15
@@
using namespace std;
extern "C" void HandleServerSideSignals(CORBA::ORB_ptr theORB);
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
int main(int argc, char* argv[])
{
#ifdef HAVE_MPI2
@@
-93,8
+104,12
@@
int main(int argc, char* argv[])
}
else
{
}
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() ;
Py_Initialize() ;
- PySys_SetArgv( argc , argv ) ;
+ PySys_SetArgv( argc ,
changed_
argv ) ;
}
char *containerName = "";
}
char *containerName = "";