diff --git a/trunk/paradiseo-peo/src/peoParaSGATransform.h b/trunk/paradiseo-peo/src/peoParaSGATransform.h index 38cb7a62a..db18c9cc4 100644 --- a/trunk/paradiseo-peo/src/peoParaSGATransform.h +++ b/trunk/paradiseo-peo/src/peoParaSGATransform.h @@ -37,25 +37,20 @@ #ifndef __peoParaSGATransform_h #define __peoParaSGATransform_h -#include "peoTransform.h" #include "core/thread.h" #include "core/messaging.h" #include "core/peo_debug.h" +#include "core/service.h" extern int getNodeRank(); -template< class EOT > class peoParaSGATransform : public peoTransform< EOT > +template< class EOT > class peoParaSGATransform : public Service, public eoTransform< EOT > { public: - using peoTransform< EOT > :: requestResourceRequest; - using peoTransform< EOT > :: resume; - using peoTransform< EOT > :: stop; - using peoTransform< EOT > :: getOwner; - peoParaSGATransform( eoQuadOp< EOT >& __cross, diff --git a/trunk/paradiseo-peo/src/peoTransform.h b/trunk/paradiseo-peo/src/peoTransform.h deleted file mode 100644 index c86dfe8e7..000000000 --- a/trunk/paradiseo-peo/src/peoTransform.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ - -#ifndef __peoTransform_h -#define __peoTransform_h - -#include - -#include "core/service.h" - -//! Interface class for constructing more complex transformation operators. - -//! The peoTransform class acts only as an interface for creating transform operators - for an example -//! please refer to the peoSeqTransform and the peoParaSGATransform classes. -template< class EOT > class peoTransform : public Service, public eoTransform< EOT > - {}; - - -#endif