#3174 BBTK Bug New Normal - boost in fedore 26

[bbtk.git] / kernel / src / bbtkObject.h

diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h
index ac9a5b98003025f61f6b1be2b996633253c7b7c6..c2d9e9a2bb4e8b2ffde01643ac2b2be6ce52ffba 100644 (file)
--- a/kernel/src/bbtkObject.h
+++ b/kernel/src/bbtkObject.h
@@ -1,20 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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/05/06 13:45:12 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
+
+
+
 /**
  *\file
  *\brief  Object : the top class of bbtk class hierarchy 
@@ -52,6 +72,9 @@ namespace bbtk
     static void InsertInObjectList(Pointer);
     static void RemoveFromObjectList(WeakPointer);
 
+    static void InsertInPackageList(Pointer);
+    static void ReleasePackages();
+
     static void PrintObjectListInfo(const std::string& name);
     //    static void PrintObjectInfo(const std::string& name);
     static void PrintObjectInfo(const Pointer& o); 
@@ -62,8 +85,9 @@ namespace bbtk
     struct BBTK_EXPORT Deleter 
     { 
       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;
     };
 
@@ -81,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;
        }                                                               
@@ -101,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;
        }                                                               
@@ -115,10 +139,10 @@ namespace bbtk
       return p;                                                        
     }                                                                  
      
-
   private:
     typedef std::set<boost::weak_ptr<Object> > ObjectListType;
     static ObjectListType mgObjectList;
+    static ObjectListType mgPackageList;
     WeakPointer mThisPointer;                                          
     Pointer mThisPointerLocked;                                                
 
@@ -189,7 +213,7 @@ protected:                                                          \
 
     static bool PrintObjectListInfo;
   private:
-         static bbtk::Object mObject;
+    static bbtk::Object mObject;
   };