#3203

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 44e3b2c8e411f44021be62f35f67272b1014c838..70e2ba847bb111aa56084fff2e24881000285d2e 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -1,4 +1,4 @@
- # ---------------------------------------------------------------------
+ # ---------------------------------------------------------------------
  #
  # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
  #                        pour la SantÈ)
@@ -92,10 +92,12 @@ IF(UNIX) #Avoid polluting Win32 cmakecache
   CHECK_INCLUDE_FILE("inttypes.h"   CMAKE_HAVE_INTTYPES_H)
   # termios 
   CHECK_INCLUDE_FILE("termios.h"   CMAKE_HAVE_TERMIOS_H)
+
 ENDIF(UNIX)
+
 # Special Time support, two conventions: *NIX vs Win32
-CHECK_INCLUDE_FILE("sys/times.h"    CMAKE_HAVE_SYS_TIMES_H)
-CHECK_INCLUDE_FILE("sys/timeb.h"    CMAKE_HAVE_SYS_TIMEB_H)
+ CHECK_INCLUDE_FILE("sys/times.h"    CMAKE_HAVE_SYS_TIMES_H)
+ CHECK_INCLUDE_FILE("sys/timeb.h"    CMAKE_HAVE_SYS_TIMEB_H)
 #-----------------------------------------------------------------------------
 
   

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 0c304e081d882cf2224bb207e22fc3058c82cb1a..2c9b0c57d7ec97f7521152d85861fa9d08d0aaf8 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -103,7 +103,7 @@ namespace bbtk
   ///  Gets the input Data of a given name
   Data AtomicBlackBox::bbGetInput( const std::string &name ) 
   {
-    bbtkBlackBoxDebugMessage("data",7,
+  bbtkBlackBoxDebugMessage("data",7,
                             "AtomicBlackBox::bbGetInput(\""<<name<<"\")"
                             <<std::endl);  
     
@@ -200,6 +200,5 @@ namespace bbtk
   }
   //==========================================================================
 
- 
 }
 // EO namespace bbtk

diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h
index f9d09f6ce064e3c123cc23b268c5148cdf19596f..9d38547c96627753cb9e04afe4da894be44035e7 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.h
+++ b/kernel/src/bbtkAtomicBlackBox.h
@@ -49,7 +49,6 @@
 
 #include "bbtkBlackBox.h"
 #include "bbtkAtomicBlackBoxDescriptor.h"
-
 namespace bbtk
 {
 

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index db02118273aaa83c2f12a3e7f912c656dca50d1e..6da0d20270400ef2470e83d3d6a605e4927c4a4e 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -56,8 +56,8 @@
 #include <set>
 
 // Signal/slot mechanism for output change events
-#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
+#include <boost/signals2/signal.hpp>
 
 
 #define bbtkBlackBoxMessage(key,level,mess) \
@@ -67,7 +67,6 @@
 
 namespace bbtk
 {
-
   struct Void { Void(int = 0) {} };
 
   class Factory;

diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h
index 811c0b671e8d3e0c16c0bbc69afcf5d919f5e568..a172adb8362746a52c5a0706b8d77e10db0d98df 100644 (file)
--- a/kernel/src/bbtkObject.h
+++ b/kernel/src/bbtkObject.h
@@ -105,7 +105,8 @@ namespace bbtk
     {                                                                  
       if (s->mThisPointer.lock())                                      
        {                                                               
-         boost::shared_ptr<U> p = s->GetThisPointer<U>();
+//EED 2018-07-11 minwg64 
+         boost::shared_ptr<U> p = s->template GetThisPointer<U>();
          if (!lock) s->mThisPointerLocked.reset();
          return p;
        }                                                               
@@ -124,8 +125,9 @@ namespace bbtk
                                             bool lock = false)
     {                                                                  
       if (s->mThisPointer.lock())                                      
-       {                                                               
-         boost::shared_ptr<U> p = s->GetThisPointer<U>();
+       {                       
+//EED 2018-07-11 minwg64 
+         boost::shared_ptr<U> p = s->template GetThisPointer<U>();
          if (!lock) s->mThisPointerLocked.reset();
          return p;
        }