From 9db85c7a07a4f94898766bbdce573b77701a82c4 Mon Sep 17 00:00:00 2001 From: davila Date: Mon, 29 Dec 2014 10:31:33 +0100 Subject: [PATCH] #2495 BBTK Bug New Normal - Boost signals deprecated -> signals2 --- kernel/src/bbtkBlackBox.h | 6 +++--- kernel/src/bbtkInterpreterVirtual.h | 2 +- kernel/src/bbtkPackage.cxx | 1 + kernel/src/bbtkWx.h | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h index 17f5999..7ce4db3 100644 --- a/kernel/src/bbtkBlackBox.h +++ b/kernel/src/bbtkBlackBox.h @@ -56,7 +56,7 @@ #include // Signal/slot mechanism for output change events -#include +#include #include @@ -84,8 +84,8 @@ namespace bbtk //================================================================== // Types //================================================================== - typedef boost::signals::trackable OutputChangeObserverType; - typedef boost::signal OutputChangeSignalType; typedef OutputChangeSignalType::slot_function_type diff --git a/kernel/src/bbtkInterpreterVirtual.h b/kernel/src/bbtkInterpreterVirtual.h index eedfe03..8370cc2 100644 --- a/kernel/src/bbtkInterpreterVirtual.h +++ b/kernel/src/bbtkInterpreterVirtual.h @@ -58,7 +58,7 @@ #include // Signal/slot mechanism for 'break' commands -#include +//#include #include namespace bbtk diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx index 16f4ffb..f292957 100644 --- a/kernel/src/bbtkPackage.cxx +++ b/kernel/src/bbtkPackage.cxx @@ -396,6 +396,7 @@ namespace bbtk bbtkDebugMessage("package",3,"* Symbol ["< +#include #include // \BBTKWXSIG //=========================================================================== @@ -99,8 +99,8 @@ namespace bbtk { public: // BBTKWXSIG - typedef boost::signals::trackable SignalObserver; - typedef boost::signal Signal_type; + typedef boost::signals2::trackable SignalObserver; + typedef boost::signals2::signal Signal_type; typedef Signal_type::slot_function_type Slot_function_type; // \BBTKWXSIG -- 2.47.1