#3005 BBTK Feature New Normal - TypeName in message system BlackBox

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

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index adddc294c0f355d03f4d1e2966bfbeb5c6fd0b84..db02118273aaa83c2f12a3e7f912c656dca50d1e 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -56,14 +56,14 @@
 #include <set>
 
 // Signal/slot mechanism for output change events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 
 
 #define bbtkBlackBoxMessage(key,level,mess) \
-  bbtkMessage(key,level,"["<<bbGetName()<<"] "<<mess)
+  bbtkMessage(key,level,"["<<bbGetTypeName()<<":"<<bbGetName()<<"] "<<mess)
 #define bbtkBlackBoxDebugMessage(key,level,mess)       \
-  bbtkDebugMessage(key,level,"["<<bbGetName()<<"] "<<mess)
+  bbtkDebugMessage(key,level,"["<<bbGetTypeName()<<":"<<bbGetName()<<"] "<<mess)
 
 namespace bbtk
 {
@@ -84,8 +84,8 @@ namespace bbtk
     //==================================================================
     // Types
     //==================================================================
-    typedef boost::signals::trackable OutputChangeObserverType;
-    typedef boost::signal<void (bbtk::BlackBox::Pointer,
+    typedef boost::signals2::trackable OutputChangeObserverType;
+    typedef boost::signals2::signal<void (bbtk::BlackBox::Pointer,
                                const std::string&,
                                IOStatus)>  OutputChangeSignalType;
     typedef OutputChangeSignalType::slot_function_type
@@ -488,7 +488,7 @@ namespace bbtk
 
     //==================================================================
     /// Computes the final IOStatus of inputs and outputs after processing
-    void bbComputePostProcessStatus();
+virtual    void bbComputePostProcessStatus();
     //@}
     //==================================================================
 
@@ -567,17 +567,13 @@ namespace bbtk
     //@{
 
     /// Connects the input <name> to the connection c
-    virtual void bbConnectInput( const std::string& name,
-                                Connection* c);
+    virtual void bbConnectInput( const std::string& name, Connection* c);
     /// Connects the output <name> to the connection c
-    virtual void bbConnectOutput( const std::string& name,
-                                 Connection* c);
+    virtual void bbConnectOutput( const std::string& name, Connection* c);
     /// Disconnects the input <name> from the connection c
-    virtual void bbDisconnectInput( const std::string& name,
-                                   Connection* c);
+    virtual void bbDisconnectInput( const std::string& name, Connection* c);
     /// Disconnects the output <name> from the connection c
-    virtual void bbDisconnectOutput( const std::string& name,
-                                    Connection* c);
+    virtual void bbDisconnectOutput( const std::string& name, Connection* c);
     //@}
     //==================================================================
 
@@ -590,8 +586,6 @@ namespace bbtk
     /// Sets the bbmExecuting bool returned by bbGetExecuting
     void bbSetExecuting(bool b) { bbmExecuting = b; }
 
-  protected:
-
     //==================================================================
   protected: