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 'master' branch into 'V9_dev' branch
[modules/kernel.git]
/
src
/
Container
/
SALOME_Component_i.hxx
diff --git
a/src/Container/SALOME_Component_i.hxx
b/src/Container/SALOME_Component_i.hxx
index e71134f9799e60a4af44e8d3b5fa6b897fcae870..4235f5048ac3a50568355fec98c0d46a3b2a51cd 100644
(file)
--- a/
src/Container/SALOME_Component_i.hxx
+++ b/
src/Container/SALOME_Component_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-81,7
+81,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);
@@
-97,8
+96,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);
@@
-118,7
+116,7
@@
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 CORBA::string_dup(""); }
+ virtual char* getObjectInfo(const char* entry) { return CORBA::string_dup(""); }
// Version information
virtual char* getVersion();
// Version information
virtual char* getVersion();
@@
-130,8
+128,6
@@
public:
std::string getContainerName();
void setContainerName();
std::string getContainerName();
void setContainerName();
- virtual 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);
@@
-150,8
+146,6
@@
public:
Salome_file_i * file);
protected:
Salome_file_i * 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 ;