From: guigues <guigues>
Date: Thu, 24 Apr 2008 11:49:59 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~59
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=14214f520648101f6d2a7570f3a5f28d7494dcea;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index c06e715..f692435 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/04/24 10:24:58 $
-Version:   $Revision: 1.18 $
+Date:      $Date: 2008/04/24 11:49:59 $
+Version:   $Revision: 1.19 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See Doc/License.txt or
@@ -82,7 +82,7 @@ namespace bbtk
 
     // We have to make the shared_ptr on this because it is used 
     // in bbUnsafeAddBlackBox !
-    MakePointer(this,true);
+    MakeBlackBoxPointer(this,true);
 
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h
index 0d0560a..a729d75 100644
--- a/kernel/src/bbtkFactory.h
+++ b/kernel/src/bbtkFactory.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2008/04/24 11:49:59 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -107,7 +107,7 @@ namespace bbtk
     /// Sets the executer who created the factory (if any)
     void SetExecuter(ExecuterPointer e) { mExecuter = e; }
     /// Gets the executer who created the factory (if any)
-    ExecuterPointer GetExecuter();// { return mExecuter.lock(); }
+    ExecuterPointer GetExecuter() { return mExecuter.lock(); }
     /// Gets the executer who created the factory (if any) - const
     //    const Executer::Pointer GetExecuter() const { return mExecuter.lock(); }
 
diff --git a/kernel/src/bbtkObject.cxx b/kernel/src/bbtkObject.cxx
index e498187..be8b07d 100644
--- a/kernel/src/bbtkObject.cxx
+++ b/kernel/src/bbtkObject.cxx
@@ -187,6 +187,20 @@ namespace bbtk
 		  << std::endl << std::endl;
 	Object::PrintObjectListInfo("");
       }
+    if (Object::GetObjectsCount()>0)
+      {
+ 	std::cout << std::endl;
+	std::cout << "************************ WARNING ********************"
+		  <<std::endl;
+	std::cout << "**** "<< Object::GetObjectsCount()
+		  <<" bbtk objects still alive after main ended"<<std::endl;
+	std::cout << "**** "
+		  <<"Rerun with -M option to view the object list "
+		  <<std::endl;
+	std::cout << "*****************************************************"
+		  <<std::endl;
+
+     }
   }
   //=======================================================================
   //=======================================================================
diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h
index 483efa4..27ed132 100644
--- a/kernel/src/bbtkObject.h
+++ b/kernel/src/bbtkObject.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkObject.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/22 08:29:09 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/04/24 11:49:59 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -54,6 +54,9 @@ namespace bbtk
     static void PrintObjectListInfo(const std::string& name);
     //    static void PrintObjectInfo(const std::string& name);
     static void PrintObjectInfo(const Pointer& o); 
+
+    static long GetObjectsCount() { return mgObjectList.size(); }
+
     /// Default objects deleter : removes object from list on deletion
     struct Deleter 
     {