Create a package named XXX in a directory named XXX_PKG, to avoid troubles

[bbtk.git] / kernel / src / bbtkPackage.cxx

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 8abe68906c4c81a122b9e0c7193a391caa91d44f..66465e9813e2bb200a50e611848ad8c3d3e2cc88 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/10/16 08:52:12 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.35 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -134,7 +134,7 @@ namespace bbtk
       {
        bbtkDebugMessage("package",5,
                         "    Descriptor has already been released"
-                                <<bbtkendl);
+                       <<bbtkendl);
        return;
                  }
     //    bbtkDebugMessage("package",3,
@@ -148,7 +148,7 @@ namespace bbtk
        if (pack.expired()) 
          {
            bbtkDebugMessage("package",2,
-                                        "     ... and caused its package death"
+                             "     ... and caused its package death"
                             <<bbtkendl);
            return;
          } // pack.expired
@@ -227,7 +227,7 @@ namespace bbtk
                                 <<"') : package expired during release : bailing out"<<bbtkendl);
                break;
              }
-           
+  
 #if defined(MACOSX)
                  BlackBoxDescriptor::Pointer desc = pack.lock()->mDescriptorMap[*descname];
                  if ( (dyn==0) || (boost::dynamic_pointer_cast<ComplexBlackBoxDescriptor>(desc)) )
@@ -244,10 +244,7 @@ namespace bbtk
        UnLoadDynamicLibrary(pack);
        // Unload orphan dl packages 
        Package::UnLoadReleasedDynamicallyLoadedPackages();
-       
 
-       
-       
       }
     
 #ifdef BBTK_COMPILE_DEBUG_MESSAGES
@@ -577,16 +574,15 @@ namespace bbtk
   {
     if (pack.expired() || (!pack.lock()->mDynamicLibraryHandler))
       return;
-    
-    
+
     std::string packname = pack.lock()->GetName();
     bbtkDebugMessage("package",5,"==> Package::UnLoadDynamicLibrary('"
                     <<packname<<"')"
                     <<std::endl);
-    
+
     if (!pack.lock()->GetDescriptorMap().empty())
       {
-       
+
        bbtkDebugMessage("package",5,"   Package not empty ... abort"
                         <<std::endl);
        return;
@@ -595,7 +591,6 @@ namespace bbtk
                        <<"DescriptorMap not empty "
                        <<BBTK_INTERNAL_ERROR_MESSAGE);
        */
-       
       }
 
     if (pack.use_count()!=1)
@@ -618,13 +613,11 @@ namespace bbtk
        bbtkDebugMessage("package",1,"==> package '"<<packname
                         <<"' put in the 'to unload' list"
                         <<std::endl);
-
       }
 
     bbtkDebugMessage("package",5,"<== Package::UnLoadDynamicLibrary('"
                     <<packname<<"')"
-                    <<std::endl);
-    
+                    <<std::endl); 
   }
   //==========================================================================
 
@@ -684,6 +677,18 @@ namespace bbtk
   }
   //==========================================================================
 
+//ups4 EED borrame
+       bool Package::ifBoxExist( std::string type)     
+    {
+               bool ok=false;
+               DescriptorMapType::const_iterator i = mDescriptorMap.find(type);
+               if (i != mDescriptorMap.end())  
+               {
+                       ok=true;
+               }
+               return ok;
+    }
+       
   //==========================================================================
   /// Creates an instance of a black box of type <type> with name <name>
   BlackBox::Pointer Package::NewBlackBox(const std::string& type,