From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Mon, 25 May 2009 12:48:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~41
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ed1e038b4fab37ba9229f70535a73c2c80234002;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index f3531fc..eaff909 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 15:22:51 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2009/05/25 12:48:57 $
+  Version:   $Revision: 1.26 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -35,8 +35,8 @@
  */
 #include "bbtkComplexBlackBox.h"
 #include "bbtkWx.h"
-#include "bbtkBlackBoxDescriptor.h"
-#include "bbtkFactory.h"
+//#include "bbtkBlackBoxDescriptor.h"
+//#include "bbtkFactory.h"
 #include "bbtkConfigurationFile.h"
 
 namespace bbtk
diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index 72f4e6f..740dcb9 100644
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkSystem.h,v $
   Language:  C++
-  Date:      $Date: 2009/01/08 10:18:29 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/25 12:48:57 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -74,6 +74,8 @@
 // To avoid warning :
 // 'PACKAGE_NAMEGetPackage' has C-linkage specified, but returns UDT 'boost::shared_ptr<T>' which is incompatible with C
 #pragma warning ( disable : 4190 )
+
+
 #endif //_MSC_VER
 
 
@@ -99,7 +101,10 @@
 // class ClassName
 
 
-
+#if defined(_WIN32) 
+  // IF NOT DEF THEN INTERNAL COMPILER ERROR WITH BOOST 1.37 ON VISUAL C++ 
+  #define BOOST_SP_NO_SP_CONVERTIBLE
+#endif
 
 #if defined(_WIN32) 
 //&& defined(BUILD_SHARED_LIBS)