Salome HOME
projects
/
samples
/
component.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vuzlov/26457'
[samples/component.git]
/
src
/
AdditionComponent
/
AdditionComponent_Impl.cxx
diff --git
a/src/AdditionComponent/AdditionComponent_Impl.cxx
b/src/AdditionComponent/AdditionComponent_Impl.cxx
index 3c992f3c03315f1aba6d41b3be65165480deb237..f19448b9c0dbe7420701979d462dfbd9d7c6e773 100644
(file)
--- a/
src/AdditionComponent/AdditionComponent_Impl.cxx
+++ b/
src/AdditionComponent/AdditionComponent_Impl.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
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
@@
-36,13
+36,12
@@
#include <string>
#include "utilities.h"
#include <string>
#include "utilities.h"
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include "AdditionComponent_Impl.hxx"
#include "SALOME_NamingService.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include "AdditionComponent_Impl.hxx"
-#include "Adder_Impl.hxx"
+#include "Add
ition_Add
er_Impl.hxx"
#include "COMPONENT_version.h"
using namespace std;
#include "COMPONENT_version.h"
using namespace std;
@@
-237,9
+236,7
@@
CORBA::Boolean AdditionInterface_Impl::AdditionObjRefs( AdditionComponent::Addit
bool RetVal = true ;
beginService( "AdditionInterface_Impl::AdditionObjRefs" );
cout << "beginService AdditionInterface_Impl::AdditionObjRefs" << endl ;
bool RetVal = true ;
beginService( "AdditionInterface_Impl::AdditionObjRefs" );
cout << "beginService AdditionInterface_Impl::AdditionObjRefs" << endl ;
- ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
- ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
- CORBA::ORB_var orb = init(0 , 0 ) ;
+ CORBA::ORB_var orb = KERNEL::GetRefToORB();
char * IOR = orb->object_to_string( AdditionInterface1 );
cout << "AdditionInterface_Impl::AdditionObjRefs AdditionInterface1 " << AdditionInterface1 << " IOR "
<< IOR << " nil " << CORBA::is_nil( AdditionInterface1 ) << endl ;
char * IOR = orb->object_to_string( AdditionInterface1 );
cout << "AdditionInterface_Impl::AdditionObjRefs AdditionInterface1 " << AdditionInterface1 << " IOR "
<< IOR << " nil " << CORBA::is_nil( AdditionInterface1 ) << endl ;