[EDF29093] : Quick fix resorbed

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_Callback_i.hxx

diff --git a/src/SALOMEDS/SALOMEDS_Callback_i.hxx b/src/SALOMEDS/SALOMEDS_Callback_i.hxx
index 572ba5b401fbb12c22c0195baf02d9be95d86398..b09dc095e880d48936d8a596514719e5845d954e 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Callback_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Callback_i.hxx
@@ -1,13 +1,30 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+// Copyright (C) 2007-2023  CEA, EDF, 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  CEA/DEN, EDF R&D
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
 //  File   : SALOMEDS_Study_i.hxx
 //  Author : Yves FRICAUD
 //  Module : SALOME
-
+//
 #ifndef __SALOMEDS_CALLBACK_I_H__
 #define __SALOMEDS_CALLBACK_I_H__
 
@@ -15,18 +32,16 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-class SALOMEDS_Callback_i: public POA_SALOMEDS::Callback,
-                          public PortableServer::RefCountServantBase {
-
+class SALOMEDS_Callback_i: public virtual POA_SALOMEDS::Callback,
+                           public virtual PortableServer::ServantBase 
+{
 private:
-  CORBA::ORB_var _orb;
   SALOMEDS::UseCaseBuilder_var _builder;
 
 public:
 
- SALOMEDS_Callback_i(SALOMEDS::UseCaseBuilder_ptr builder, CORBA::ORB_ptr orb) {
-   _orb = CORBA::ORB::_duplicate(orb);
-   _builder = SALOMEDS::UseCaseBuilder::_duplicate(builder);
+ SALOMEDS_Callback_i(SALOMEDS::UseCaseBuilder_ptr theBuilder) {
+   _builder = SALOMEDS::UseCaseBuilder::_duplicate(theBuilder);
  }
 
  virtual void OnAddSObject(SALOMEDS::SObject_ptr theObject) {