Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

[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 29569168cf0460375953cc4bfd290ca93bdebdc1..de95e492b6f3d951648c9da5c452a062761bc817 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Callback_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Callback_i.hxx
@@ -1,10 +1,29 @@
-//  File      : SALOMEDS_Study_i.hxx
-//  Created   : Wed Feb 26 11:27:37 2003
-//  Author    : Yves FRICAUD
-//  Project   : SALOME
-//  Module    : SALOMEDS
-//  Copyright : Open CASCADE 2003
-
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  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__
 
@@ -12,18 +31,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) {