Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Hypothesis_i.cxx
diff --git
a/src/SMESH_I/SMESH_Hypothesis_i.cxx
b/src/SMESH_I/SMESH_Hypothesis_i.cxx
index cbce54f50f6a6c2f627f8404f5dbaeaef5d05c71..d5c26045a7eec4c98a70e4d449071ed3aad55891 100644
(file)
--- a/
src/SMESH_I/SMESH_Hypothesis_i.cxx
+++ b/
src/SMESH_I/SMESH_Hypothesis_i.cxx
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
// File : SMESH_Hypothesis_i.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// File : SMESH_Hypothesis_i.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
@@
-60,7
+60,7
@@
SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA )
SMESH_Hypothesis_i::~SMESH_Hypothesis_i()
{
SMESH_Hypothesis_i::~SMESH_Hypothesis_i()
{
- MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" );
+
//
MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" );
if ( myBaseImpl )
delete myBaseImpl;
};
if ( myBaseImpl )
delete myBaseImpl;
};
@@
-126,10
+126,9
@@
CORBA::Long SMESH_Hypothesis_i::GetId()
bool SMESH_Hypothesis_i::IsPublished()
{
bool res = false;
bool SMESH_Hypothesis_i::IsPublished()
{
bool res = false;
- if ( SMESH_Gen_i
*gen = SMESH_Gen_i::GetSMESHGen()
)
+ if ( SMESH_Gen_i
::GetSMESHGen()
)
{
{
- SALOMEDS::Study_var study = gen->GetCurrentStudy();
- SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( study, _this());
+ SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( _this());
res = !SO->_is_nil();
}
return res;
res = !SO->_is_nil();
}
return res;