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
Merge branch 'V9_11_BR'
[modules/kernel.git]
/
src
/
MPIContainer
/
SALOME_MPIContainer.cxx
diff --git
a/src/MPIContainer/SALOME_MPIContainer.cxx
b/src/MPIContainer/SALOME_MPIContainer.cxx
index bdda5f12d93188e4f27e7c80cc00f0329603f396..28fd3acd24a78a63fb6613e3771c8dcf81cb7879 100644
(file)
--- a/
src/MPIContainer/SALOME_MPIContainer.cxx
+++ b/
src/MPIContainer/SALOME_MPIContainer.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-22,9
+22,9
@@
#include <mpi.h>
#include <iostream>
#include <mpi.h>
#include <iostream>
+#include "ArgvKeeper.hxx"
#include "MPIContainer_i.hxx"
#include "MPIContainer_i.hxx"
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
#include "utilities.h"
int main(int argc, char* argv[])
#include "utilities.h"
int main(int argc, char* argv[])
@@
-36,8
+36,8
@@
int main(int argc, char* argv[])
MPI_Comm_rank(MPI_COMM_WORLD,&numproc);
// Initialise the ORB.
MPI_Comm_rank(MPI_COMM_WORLD,&numproc);
// Initialise the ORB.
-
ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance()
;
- CORBA::ORB_
var &orb = init( argc , argv )
;
+
SetArgcArgv(argc, argv)
;
+ CORBA::ORB_
ptr orb = KERNEL::GetRefToORB()
;
// SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
BEGIN_OF("[" << numproc << "] " << argv[0])
// SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
BEGIN_OF("[" << numproc << "] " << argv[0])