Merge branch V7_3_1_BR

[modules/yacs.git] / src / SALOMEDS / SALOMEDS_GenericAttribute_i.hxx

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
index 3525bde15a4b26b3bc0506a8b38ba2df208b9c25..516f329c9db66535f3cd530234f7597c096830c3 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
@@ -1,7 +1,29 @@
+// Copyright (C) 2007-2014  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, 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
+//
+
 //  File   : SALOMEDS_GenericAttribute_i.hxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
+//
 #ifndef _GENERIC_ATTRIBUTE_I_HXX_
 #define _GENERIC_ATTRIBUTE_I_HXX_
 
@@ -9,22 +31,22 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include <SALOME_GenericObj_i.hh>
-#include <TDF_Attribute.hxx>
+#include "DF_Attribute.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include "SALOMEDSImpl_GenericAttribute.hxx"
 
 class Standard_EXPORT SALOMEDS_GenericAttribute_i: public virtual POA_SALOMEDS::GenericAttribute,
-                                  public virtual PortableServer::RefCountServantBase,
-                                  public virtual SALOME::GenericObj_i
+                                   public virtual PortableServer::ServantBase,
+                                   public virtual SALOME::GenericObj_i
 {
 
 protected:
-  Handle(TDF_Attribute) _impl;
-  CORBA::ORB_ptr        _orb;
+  DF_Attribute*    _impl;
+  CORBA::ORB_var   _orb;
 
 public:
-  SALOMEDS_GenericAttribute_i(const Handle(TDF_Attribute)& theImpl, CORBA::ORB_ptr theOrb);
-  virtual ~SALOMEDS_GenericAttribute_i() {};
+  SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb);
+  virtual ~SALOMEDS_GenericAttribute_i();
 
   void CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection);
   
@@ -34,11 +56,11 @@ public:
 
   SALOMEDS::SObject_ptr GetSObject();
   
-  virtual Handle(TDF_Attribute) GetImpl() { return _impl; }
+  virtual DF_Attribute* GetImpl() { return _impl; }
 
-  static SALOMEDS::GenericAttribute_ptr CreateAttribute(const Handle(TDF_Attribute)& theAttr, CORBA::ORB_ptr theOrb);  
+  static SALOMEDS::GenericAttribute_ptr CreateAttribute(DF_Attribute* theAttr, CORBA::ORB_ptr theOrb);  
 
-  virtual long GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal);
+  virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal);
 };
 
 #endif