Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 13/12/2012
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_ChildIterator_i.hxx
diff --git
a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
index 7092d89f3709cbb5622134435f1458b1fd030cf2..087cf044fd9c2d5ca815a995e8b3517b6b67515e 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
+++ b/
src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
@@
-1,26
+1,29
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012 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
// 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
// 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
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
// 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
+//
+// 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.
//
// 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
+// 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
//
// 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_ChildIterator_i.hxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_ChildIterator_i.hxx
// Author : Sergey RUIN
// Module : SALOME
-
+//
#ifndef __SALOMEDS_CHILDITERATOR_I_H__
#define __SALOMEDS_CHILDITERATOR_I_H__
#ifndef __SALOMEDS_CHILDITERATOR_I_H__
#define __SALOMEDS_CHILDITERATOR_I_H__
@@
-37,16
+40,16
@@
#include <stdio.h>
class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator,
#include <stdio.h>
class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator,
-
public virtual PortableServer::RefCount
ServantBase,
- public virtual SALOME::GenericObj_i
+
public virtual PortableServer::
ServantBase,
+
public virtual SALOME::GenericObj_i
{
private:
{
private:
- CORBA::ORB_
pt
r _orb;
-
Handle(SALOMEDSImpl_ChildIterator)
_it;
+ CORBA::ORB_
va
r _orb;
+
SALOMEDSImpl_ChildIterator*
_it;
public:
//! standard constructor
public:
//! standard constructor
- SALOMEDS_ChildIterator_i(const
Handle(SALOMEDSImpl_ChildIterator)
&, CORBA::ORB_ptr);
+ SALOMEDS_ChildIterator_i(const
SALOMEDSImpl_ChildIterator
&, CORBA::ORB_ptr);
//! standard destructor
~SALOMEDS_ChildIterator_i();
//! standard destructor
~SALOMEDS_ChildIterator_i();