no message

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

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index aa70474fbb3b0f0682d9f5b98485c3fec7718e74..17e1c05369619f7103aacceec0b68f65c70b4798 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:33 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/06/10 11:36:51 $
+  Version:   $Revision: 1.19 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -98,10 +98,10 @@
   }                                                                    \
   inline bbtk::BlackBox::Pointer bbClone(const std::string& name)      \
   {                                                                    \
-    bbtkDebugMessage("object",1,"##> "<<#CLASS                         \
-                    <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
+    bbtkBlackBoxDebugMessage("object",1,"##> "<<#CLASS                 \
+                            <<"::bbClone(\""<<name<<"\")"<<std::endl); \
     Pointer p = MakeBlackBoxPointer(new Self(*this,name));             \
-    bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
+    bbtkBlackBoxDebugMessage("object",1,"<## "<<#CLASS                 \
                     <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
     return p;                                                          \
   }                                                                    \
@@ -143,11 +143,11 @@
   public:                                                              \
   inline void bbUserProcess()                                          \
   {                                                                    \
-    bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()   \
-                    <<"]"<<std::endl);                                 \
+    bbtkBlackBoxDebugMessage("process",1,"**> Processing..."           \
+                            <<std::endl);                              \
     CALLBACK();                                                                \
-    bbtkDebugMessage("process",1,"<** Processing ["<<bbGetFullName()   \
-                    <<"]"<<std::endl);                                 \
+    bbtkBlackBoxDebugMessage("process",1,"<** Processing"              \
+                            <<std::endl);                              \
   }
 //============================================================================
 
@@ -203,8 +203,8 @@
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,ALLOC)                  \
-  bbtkDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS             \
-                  <<"(\""<<bbGetName()<<"\")"<<std::endl);             \
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS     \
+                          <<"()"<<std::endl);                          \
   if (ALLOC)                                                           \
     {                                                                  \
       bbLockDescriptor();                                              \
@@ -215,15 +215,15 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS)                          \
-  bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS             \
-                  <<"(\""<<bbGetName()<<"\")"<<std::endl);             
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS     \
+                          <<"()"<<std::endl);          
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)                \
-  bbtkDebugMessageInc("object",2,"==> "<<#CLASS<<"::"<<#CLASS          \
-                     <<"("<<FROM.bbGetFullName()<<",\""                \
-                     <<bbGetName()<<"\")"<<std::endl);                 \
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS<<"::"<<#CLASS     \
+                          <<"("<<FROM.bbGetFullName()                  \
+                          <<")"<<std::endl);                           \
   if (ALLOC)                                                           \
     {                                                                  \
       bbLockDescriptor();                                              \
@@ -233,9 +233,9 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)          \
-  bbtkDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS             \
-                  <<"("<<FROM.bbGetFullName()<<",\""                   \
-                  <<bbGetName()<<"\")"<<std::endl);                    \
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS<<"::"<<#CLASS     \
+                          <<"("<<FROM.bbGetFullName()                  \
+                          <<")"<<std::endl);                           \
   if (ALLOC)                                                           \
     {                                                                  \
       bbCopyIOValues(FROM);                                            \
@@ -244,16 +244,17 @@
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)                         \
-  bbtkDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS          \
-                  <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);    
+  bbtkBlackBoxDebugMessage("object",2,"==> "<<#CLASS <<"::~"<< #CLASS  \
+                          <<"()"<<std::endl); \
+  bbFinalizeProcessing();                                              
 
 
 //============================================================================
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS)                           \
-  bbtkDebugMessage("object",2,"<== "<<#CLASS <<"::~"<< #CLASS          \
-                  <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
+  bbtkBlackBoxDebugMessage("object",2,"<== "<<#CLASS <<"::~"<< #CLASS  \
+                          <<"()"<<std::endl);
 
 //============================================================================
 
@@ -279,7 +280,6 @@
   CLASS::~CLASS()                                                      \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS::bbUserFinalizeProcessing();                                 \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   void CLASS::bbLockDescriptor()                                       \
@@ -544,6 +544,9 @@
                       (&CLASS<T>::bbSetOutput##NAME) ) )
 //============================================================================
 
+
+//JCP 09JUIN2009 BBTK_EXPORT
+
 //============================================================================
 /// Template AtomicBlackBox std implementation of ctor and dtor
 #define BBTK_BLACK_BOX_TEMPLATE_IMPLEMENTATION(CLASS,PARENT)           \
@@ -568,7 +571,6 @@
   CLASS<T>::~CLASS()                                                   \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS<T>::bbFinalizeProcessing();                                  \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T>                                                   \
@@ -743,7 +745,6 @@
   CLASS<T1,T2>::~CLASS()                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS<T1,T2>::bbFinalizeProcessing();                              \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T1, class T2>                                                \