X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkObject.h;h=c2d9e9a2bb4e8b2ffde01643ac2b2be6ce52ffba;hb=3f88d1b429d99eca0b5ca0627063e1d08fadefd6;hp=a2bbc8f22365ead4cb9af1c6ea8c4e4d31e127bf;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h
index a2bbc8f..c2d9e9a 100644
--- a/kernel/src/bbtkObject.h
+++ b/kernel/src/bbtkObject.h
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkObject.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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
@@ -80,7 +87,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;
     };
 
@@ -98,7 +105,7 @@ namespace bbtk
     {									
       if (s->mThisPointer.lock())					
 	{								
-	  boost::shared_ptr<U> p = s->GetThisPointer<U>();
+	  boost::shared_ptr<U> p = s->template GetThisPointer<U>();
 	  if (!lock) s->mThisPointerLocked.reset();
 	  return p;
 	}								
@@ -118,7 +125,7 @@ namespace bbtk
     {									
       if (s->mThisPointer.lock())					
 	{								
-	  boost::shared_ptr<U> p = s->GetThisPointer<U>();
+	  boost::shared_ptr<U> p = s->template GetThisPointer<U>();
 	  if (!lock) s->mThisPointerLocked.reset();
 	  return p;
 	}								
@@ -132,7 +139,6 @@ namespace bbtk
       return p;							
     }									
      
-
   private:
     typedef std::set<boost::weak_ptr<Object> > ObjectListType;
     static ObjectListType mgObjectList;