*** empty log message ***

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

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index 8d8df46887321cba621ccdd968e863dbad63de29..9bc56ad02c3d59b53d957fe7adcfc962f93700b1 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/04/08 07:56:11 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2009/04/30 14:31:30 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -41,7 +41,7 @@
 /// Declares the standard interface of a AtomicBlackBox 
 /// (ctor, New, descriptor related methods)
 #define BBTK_BLACK_BOX_INTERFACE_INTERNAL_WITHOUT_NEW(CLASS,PARENT)    \
-  BBTK_OBJECT_MINIMAL_INTERFACE;                               \
+  BBTK_OBJECT_MINIMAL_INTERFACE;                                       \
   private:                                                             \
   protected:                                                           \
   CLASS(const std::string& name, bool allocate_connectors = true);     \
@@ -53,10 +53,18 @@
   { return std::string(#CLASS)+std::string(" '")                       \
       +bbGetNameWithParent()+std::string("'"); }                       \
   virtual void bbLockDescriptor();                                     \
+  virtual void bbConstructor() {                                       \
+    PARENT::bbConstructor();                                           \
+    CLASS::bbUserConstructor();                                                \
+  }                                                                    \
+  virtual void bbDestructor() {                                                \
+    PARENT::bbDestructor();                                            \
+    CLASS::bbUserDestructor();                                         \
+  }                                                                    \
   private:                                                             \
   CLASS() : PARENT("") {}                                              \
   CLASS(const CLASS&) : PARENT("") {}                                  
-
+  
 //============================================================================
 
 //============================================================================
@@ -93,6 +101,14 @@
     return p;                                                          \
   }                                                                    \
   virtual void bbLockDescriptor();                                     \
+  virtual void bbConstructor() {                                       \
+    PARENT::bbConstructor();                                           \
+    CLASS::bbUserConstructor();                                                \
+  }                                                                    \
+  virtual void bbDestructor() {                                                \
+    PARENT::bbDestructor();                                            \
+    CLASS::bbUserDestructor();                                         \
+  }                                                                    \
   private:                                                             \
   CLASS() : PARENT("") {}                                              \
   CLASS(const CLASS&) : PARENT("") {}                                  
@@ -233,7 +249,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,allocate_connectors);       \
-    CLASS::bbUserConstructor();                                                \
+    /*CLASS::bbUserConstructor();      */                              \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   CLASS::CLASS(CLASS& from,                                            \
@@ -241,13 +257,13 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>()); \
+    /*CLASS::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   CLASS::~CLASS()                                                      \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS::bbUserDestructor();                                         \
+    /*CLASS::bbUserDestructor();*/                                     \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   void CLASS::bbLockDescriptor()                                       \
@@ -279,10 +295,10 @@
       {                                                                        \
        return Instance();                                              \
       }                                                                        \
-    static bbtk::AtomicBlackBoxDescriptor::Pointer Instance()                  \
+    static bbtk::AtomicBlackBoxDescriptor::Pointer Instance()          \
       {                                                                        \
-       static bbtk::AtomicBlackBoxDescriptor::WeakPointer i;                   \
-       bbtk::AtomicBlackBoxDescriptor::Pointer j;                              \
+       static bbtk::AtomicBlackBoxDescriptor::WeakPointer i;           \
+       bbtk::AtomicBlackBoxDescriptor::Pointer j;                      \
        if (!i.lock()) { j = Self::New(); i = j; }                      \
        return i.lock();                                                \
       }                                                                        \
@@ -520,7 +536,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);                     \
-    CLASS<T>::bbUserConstructor();                                     \
+    /*CLASS<T>::bbUserConstructor();*/                                 \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   template <class T>                                                   \
@@ -529,14 +545,14 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS<T>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>()); \
+    /*CLASS<T>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   template <class T>                                                   \
   CLASS<T>::~CLASS()                                                   \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS<T>::bbUserDestructor();                                      \
+    /*CLASS<T>::bbUserDestructor();*/                                  \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T>                                                   \
@@ -695,7 +711,7 @@
     : PARENT(name,false)                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);                     \
-    CLASS<T1,T2>::bbUserConstructor();                                 \
+    /*CLASS<T1,T2>::bbUserConstructor();*/                             \
     BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS);                             \
   }                                                                    \
   template <class T1, class T2>                                                \
@@ -704,14 +720,14 @@
     : PARENT(from,name,false)                                          \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    CLASS<T1,T2>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());        \
+    /*CLASS<T1,T2>::bbUserCopyConstructor(from.GetThisPointer<bbtk::BlackBox>());*/ \
     BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from);                   \
   }                                                                    \
   template <class T1, class T2>                                                \
   CLASS<T1,T2>::~CLASS()                                               \
   {                                                                    \
     BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    CLASS<T1,T2>::bbUserDestructor();                                  \
+    /*CLASS<T1,T2>::bbUserDestructor();*/                              \
     BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS);                              \
   }                                                                    \
   template <class T1, class T2>                                                \
@@ -722,46 +738,6 @@
 //============================================================================
 
 
-/*
-//============================================================================
-/// Template AtomicBlackBox std implementation of ctor and dtor
-#define BBTK_BLACK_BOX_TEMPLATE2_WITH_TYPES_IMPLEMENTATION(CLASS,PARENT,TYPE1,TYPE2) \
-  template <TYPE1 T1, TYPE2 T2>                                                \
-  CLASS<T1,T2>::CLASS(const std::string& name, bool alloc)             \
-    : PARENT(name,false)                                               \
-  {                                                                    \
-    BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc);                     \
-    this->bbUserConstructor();                                         \
-    BBTK_END_BLACK_BOX_CONSTRUCTOR;                                    \
-  }                                                                    \
-  template <TYPE1 T1, TYPE2 T2>                                                \
-  CLASS<T1,T2>::CLASS(CLASS<T1,T2>& from,                              \
-                     const std::string& name, bool allocate_connectors) \
-    : PARENT(from,name,false)                                          \
-  {                                                                    \
-    BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \
-    this->bbUserCopyConstructor();                                     \
-    BBTK_END_BLACK_BOX_CONSTRUCTOR;                                    \
-  }                                                                    \
-  template <TYPE1 T1, TYPE2 T2>                                                \
-  CLASS<T1,T2>::~CLASS()                                               \
-  {                                                                    \
-    BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS);                            \
-    this->bbUserDestructor();                                          \
-    BBTK_END_BLACK_BOX_DESTRUCTOR;                                     \
-  }                                                                    \
-  template <class T1, class T2>                                                \
-  void CLASS<T1,T2>::bbLockDescriptor()                                        \
-  {                                                                    \
-    bbmDescriptorPointer = CLASS ## Descriptor<T1,T2>::Instance();     \
-  }
-//============================================================================
-
-*/
-
-
-
-