#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
{
//==================================================================
// 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
//==================================================================
/// Computes the final IOStatus of inputs and outputs after processing
- void bbComputePostProcessStatus();
+virtual void bbComputePostProcessStatus();
//@}
//==================================================================
//@{
/// 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);
//@}
//==================================================================
/// Sets the bbmExecuting bool returned by bbGetExecuting
void bbSetExecuting(bool b) { bbmExecuting = b; }
- protected:
-
//==================================================================
protected: