#3205 BBTK Feature New Normal - branch vtk7itk4wx3-mxecc

diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h
index f9d09f6ce064e3c123cc23b268c5148cdf19596f..faec100dcd718173f30146d50678d41779cb8a93 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.h
+++ b/kernel/src/bbtkAtomicBlackBox.h
@@ -47,7 +47,7 @@
 #ifndef __bbtkAtomicBlackBox_h__
 #define __bbtkAtomicBlackBox_h__
 
-#include "bbtkBlackBox.h"
+#include "bbtkBlackBox.h" 
 #include "bbtkAtomicBlackBoxDescriptor.h"
 
 namespace bbtk

diff --git a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
index aafb10de89ee218cb0d80db3a641ec309c4127d0..b1398a5a9500f1b256a8395a4e34876083b5e37f 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
@@ -33,8 +33,8 @@
   Version:   $Revision: 1.6 $
 =========================================================================*/
 
-#include "bbtkAtomicBlackBoxDescriptor.h"
 #include "bbtkBlackBox.h"
+#include "bbtkAtomicBlackBoxDescriptor.h"
 #include "bbtkPackage.h"
 #define bbtkDMessage(key,level,mess) \
   bbtkMessage(key,level,"["<<GetFullTypeName()<<"] "<<mess)

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index db02118273aaa83c2f12a3e7f912c656dca50d1e..dec177279c922b16c86d8d07e6cb863fbeaca0a0 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -48,16 +48,34 @@
 #ifndef __bbtkBlackBox_h__
 #define __bbtkBlackBox_h__
 
+/*
+#include <boost/bind.hpp>
+#include <boost/signals2/signal.hpp>
+
 #include "bbtkSystem.h"
 #include "bbtkMessageManager.h"
 #include "bbtkBlackBoxDescriptor.h"
 #include "bbtkBlackBoxInputConnector.h"
+
 //#include "bbtkBlackBoxOutputConnector.h"
 #include <set>
 
 // Signal/slot mechanism for output change events
-#include <boost/signals2/signal.hpp>
+*/
+
 #include <boost/bind.hpp>
+#include <boost/signals2/signal.hpp>
+
+#include "bbtkSystem.h"
+#include "bbtkMessageManager.h"
+#include "bbtkBlackBoxDescriptor.h"
+#include "bbtkBlackBoxInputConnector.h"
+
+//#include "bbtkBlackBoxOutputConnector.h"
+#include <set>
+
+// Signal/slot mechanism for output change events
+
 
 
 #define bbtkBlackBoxMessage(key,level,mess) \

diff --git a/kernel/src/bbtkBlackBoxInputConnector.h b/kernel/src/bbtkBlackBoxInputConnector.h
index c35709d19fa8618bf217903ba3d40f14080a1c9a..aadd26f97a0596a2d20e809d12bee6b528e2e116 100644 (file)
--- a/kernel/src/bbtkBlackBoxInputConnector.h
+++ b/kernel/src/bbtkBlackBoxInputConnector.h
@@ -50,6 +50,7 @@
 #include "bbtkPimpl.h"
 #include <vector>
 
+
 namespace bbtk
 {
 

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h
index e39b6d766e9dd1e24a5367b3f3b3b524930192d2..182c2f92f9898dd1bbdf1560a7c83434fedfde72 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.h
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h
@@ -46,10 +46,10 @@
 #ifndef __bbtkComplexBlackBoxDescriptor_h__
 #define __bbtkComplexBlackBoxDescriptor_h__
 
+#include "bbtkFactory.h"
 #include "bbtkBlackBoxDescriptor.h"
 #include "bbtkComplexBlackBoxInputDescriptor.h"
 #include "bbtkComplexBlackBoxOutputDescriptor.h"
-#include "bbtkFactory.h"
 #include <fstream>
 #include <vector>
 #include "bbtkUtilities.h"

diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h
index 63769616366a18b4004a0bb2095bc74f6d5683e5..44cac2b23f11e48a9ea4f5f5ed84a4db255607c3 100644 (file)
--- a/kernel/src/bbtkExecuter.h
+++ b/kernel/src/bbtkExecuter.h
@@ -47,11 +47,10 @@
 #ifndef __bbtkExecuter_h__
 #define __bbtkExecuter_h__
 
-#include "bbtkVirtualExec.h"
+#include "bbtkFactory.h"
 
 #include "bbtkSystem.h"
 #include "bbtkComplexBlackBox.h"
-#include "bbtkFactory.h"
 #include <string>
 #include <deque>
 

diff --git a/kernel/src/bbtkInterpreterVirtual.h b/kernel/src/bbtkInterpreterVirtual.h
index 8370cc2b3025926aa6202000644fd87780521bcb..b815ac2b8b3e06ac09f73398c51a3cfde0cf18e5 100644 (file)
--- a/kernel/src/bbtkInterpreterVirtual.h
+++ b/kernel/src/bbtkInterpreterVirtual.h
@@ -47,6 +47,11 @@
 #ifndef __bbtkInterpreterVirtual_h__
 #define __bbtkInterpreterVirtual_h__
 
+
+// Signal/slot mechanism for 'break' commands
+//#include <boost/signals2/signal.hpp>
+#include <boost/bind.hpp>
+
 //#include "bbtkSystem.h"
 
 #include "bbtkMessageManager.h"
@@ -57,9 +62,6 @@
 #include <fstream>
 #include <deque>
 
-// Signal/slot mechanism for 'break' commands
-//#include <boost/signals2/signal.hpp>
-#include <boost/bind.hpp>
 
 namespace bbtk
 {

diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h
index 27d3a6edad6249c4fff1ab734a0605a4b1a835d8..b5259e7a60a3bdd6a97282fdb8304830b922495e 100644 (file)
--- a/kernel/src/bbtkVirtualExec.h
+++ b/kernel/src/bbtkVirtualExec.h
@@ -48,8 +48,8 @@
 #define __bbtkVirtualExec_h__
 
 #include "bbtkSystem.h"
-#include "bbtkComplexBlackBoxDescriptor.h"
 #include "bbtkFactory.h"
+#include "bbtkComplexBlackBoxDescriptor.h"
 
 namespace bbtk
 {