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 from V6_4_BR 05/12/2011
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Gen_i.cxx
diff --git
a/src/SMESH_I/SMESH_Gen_i.cxx
b/src/SMESH_I/SMESH_Gen_i.cxx
index 9a562756a3a7ce0a31c3fbcb95e830cde6a3859a..fe51eac073a890124681924732cabf88f7aeb93d 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i.cxx
+++ b/
src/SMESH_I/SMESH_Gen_i.cxx
@@
-297,7
+297,7
@@
SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr orb,
SALOME::Session_var session = SALOME::Session::_narrow( obj ) ;
if ( !session->_is_nil() )
{
SALOME::Session_var session = SALOME::Session::_narrow( obj ) ;
if ( !session->_is_nil() )
{
- CORBA::String_var s_host = session->getHostname();
+ CORBA::String_var s
tr
_host = session->getHostname();
CORBA::Long s_pid = session->getPID();
string my_host = Kernel_Utils::GetHostname();
#ifdef WNT
CORBA::Long s_pid = session->getPID();
string my_host = Kernel_Utils::GetHostname();
#ifdef WNT
@@
-305,7
+305,7
@@
SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr orb,
#else
long my_pid = (long) getpid();
#endif
#else
long my_pid = (long) getpid();
#endif
- SetEmbeddedMode( s_pid == my_pid && my_host == s_host.in() );
+ SetEmbeddedMode( s_pid == my_pid && my_host == s
tr
_host.in() );
}
}
}
}
}
}