X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.h;h=f9d09f6ce064e3c123cc23b268c5148cdf19596f;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=8348ea410581c314db0b4a99b428b0d86bfef2f1;hpb=edd3ac38162ff897429cc7af71557dc54e7d5efe;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h
index 8348ea4..f9d09f6 100644
--- a/kernel/src/bbtkAtomicBlackBox.h
+++ b/kernel/src/bbtkAtomicBlackBox.h
@@ -1,57 +1,38 @@
-/*=========================================================================                                                                               
+/*
+# ---------------------------------------------------------------------
+#
+# 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: bbtkAtomicBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/30 14:31:30 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
-
-/* ---------------------------------------------------------------------
-
-* 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 
@@ -141,22 +122,19 @@ namespace bbtk
     //==================================================================
 
     //==================================================================
-    /// User callback called in the box contructor
-    virtual void bbUserConstructor() {}
-    /// User callback called in the box copy constructor
-    virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer) {}
-    /// User callback called in the box destructor
-    virtual void bbUserDestructor() {}
+    /// *** TO BE REMOVED WHEN EVERYTHING IS OK ***
+    /// CHANGED RETURN TYPE OF bbUserConstructor FROM void TO int
+    /// TO PRODUCE COMPILATION ERROR IF AN USER DECLARES THE OLD 
+    /// METHOD bbUserConstructor IN ITS BOX
+    virtual int bbUserConstructor() { return 0; }
+    /// *** TO BE REMOVED WHEN EVERYTHING IS OK ***
+    /// THE SAME AS bbUserConstructor
+    virtual int bbUserCopyConstructor(bbtk::BlackBox::Pointer) { return 0; }
+    /// *** TO BE REMOVED WHEN EVERYTHING IS OK ***
+    /// THE SAME AS bbUserConstructor
+    virtual int bbUserDestructor() { return 0; }
     //==================================================================    
 
-    //==================================================================
-    /// System callback which calls bbUserConstructor for all its ancestors 
-    /// and the box itself
-    virtual void bbConstructor() {}
-    /// System callback which calls bbUserDestructor for all its ancestors 
-    /// and the box itself
-    virtual void bbDestructor() {}
-    //==================================================================    
 
      //==================================================================
   private: