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_ParallelComponent_i.hxx
diff --git
a/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
b/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
index c7832791f3b4cbe8cf3925deed9c7eaa584910a4..13c4593ad5bead07fb6efd464c6d90d884504cf7 100644
(file)
--- a/
src/ParallelContainer/SALOME_ParallelComponent_i.hxx
+++ b/
src/ParallelContainer/SALOME_ParallelComponent_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
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
@@
-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
@@
-22,7
+22,7
@@
// SALOME_ParallelComponent : implementation of container and engine for Parallel Kernel
// File : SALOME_ParallelComponent_i.hxx
// SALOME_ParallelComponent : implementation of container and engine for Parallel Kernel
// File : SALOME_ParallelComponent_i.hxx
-// Author : Andr
é
RIBES, EDF
+// Author : Andr
�
RIBES, EDF
// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
//
#ifndef _SALOME_PARALLEL_COMPONENT_I_HXX_
// Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
//
#ifndef _SALOME_PARALLEL_COMPONENT_I_HXX_
@@
-80,7
+80,6
@@
public:
void ping();
void destroy();
void ping();
void destroy();
- CORBA::Long getStudyId();
Engines::Container_ptr GetContainerRef();
void setProperties(const Engines::FieldsDict& dico);
Engines::Container_ptr GetContainerRef();
void setProperties(const Engines::FieldsDict& dico);
@@
-93,8
+92,7
@@
public:
bool Resume_impl();
CORBA::Long CpuUsed_impl() ;
bool Resume_impl();
CORBA::Long CpuUsed_impl() ;
- virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
- CORBA::Boolean isPublished,
+ virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished,
CORBA::Boolean isMultiFile,
CORBA::Boolean& isValidScript);
CORBA::Boolean isMultiFile,
CORBA::Boolean& isValidScript);
@@
-116,15
+114,13
@@
public:
// Object information
virtual bool hasObjectInfo() { return false; }
// Object information
virtual bool hasObjectInfo() { return false; }
- virtual char* getObjectInfo(
CORBA::Long studyId,
const char* entry) { return ""; }
+ virtual char* getObjectInfo(const char* entry) { return ""; }
// --- local C++ methods
PortableServer::ObjectId * getId();
Engines_Parallel_Container_i *GetContainerPtr();
// --- local C++ methods
PortableServer::ObjectId * getId();
Engines_Parallel_Container_i *GetContainerPtr();
- bool setStudyId(CORBA::Long studyId);
- static bool isMultiStudy();
static bool isMultiInstance();
static std::string GetDynLibraryName(const char *componentName);
static bool isMultiInstance();
static std::string GetDynLibraryName(const char *componentName);
@@
-146,8
+142,6
@@
public:
Engines::Parallel_Salome_file_proxy_impl * file);
protected:
Engines::Parallel_Salome_file_proxy_impl * file);
protected:
- int _studyId; // -1: not initialised; 0: multiStudy; >0: study
- static bool _isMultiStudy;
static bool _isMultiInstance;
std::string _instanceName ;
static bool _isMultiInstance;
std::string _instanceName ;