X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkObject.h;h=2ba72ffa059c47cb2b22bf24081bbee44e316da9;hb=6ac9074f717f22c4ffdc6a70d0704c1b1f8fe842;hp=2d8eb5e91c022e022ac322dc1f8e0943238d3690;hpb=97b08ef9b0c2a60c4d1f619f6bfef2996afdcab3;p=bbtk.git diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h index 2d8eb5e..2ba72ff 100644 --- a/kernel/src/bbtkObject.h +++ b/kernel/src/bbtkObject.h @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkObject.h,v $ Language: C++ - Date: $Date: 2008/07/24 14:37:05 $ - Version: $Revision: 1.6 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See doc/license.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2009/04/30 14:31:31 $ + Version: $Revision: 1.8 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* This software is governed by the CeCILL-B 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-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* or in the file LICENSE.txt. +* +* 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. +* +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL-B license and that you accept its terms. +* ------------------------------------------------------------------------ */ + /** *\file *\brief Object : the top class of bbtk class hierarchy @@ -67,7 +80,7 @@ namespace bbtk Deleter() : mPointer() {} virtual ~Deleter() {} virtual void operator() (Object* p); - virtual void Delete(Object* p) { delete p; } + virtual int Delete(Object* p) { delete p; return 0; } WeakPointer mPointer; }; @@ -119,7 +132,6 @@ namespace bbtk return p; } - private: typedef std::set > ObjectListType; static ObjectListType mgObjectList;