From 4e12ac93d073c4d32f1805f694fe5cbb4e16ba9f Mon Sep 17 00:00:00 2001 From: asl Date: Tue, 15 Dec 2009 13:39:20 +0000 Subject: [PATCH] merge --- src/GEOM_I/GEOM_Object_i.hh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index 97545eddd..00c926765 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -30,16 +30,17 @@ #include CORBA_CLIENT_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(GEOM_Gen) -#include "SALOME_GenericObj_i.hh" +#include "SALOME_ParameterizedObject.hxx" #include "GEOM_Object.hxx" #include -class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME::GenericObj_i +class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME_ParameterizedObject { public: - GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_Object) theImpl); + GEOM_Object_i( PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, + Handle(GEOM_Object) theImpl, SALOME::Notebook_ptr theNotebook ); ~GEOM_Object_i(); virtual char* GetEntry(); -- 2.39.2