From 9e2b6d4716a5d12f39d8dde0a2d719fe961bdd2c Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Thu, 2 Oct 2008 12:29:26 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/src/CMakeLists.txt      |  2 ++
 kernel/src/bbtkAny.h           |  6 ++---
 kernel/src/bbtkException.h     |  7 +++---
 kernel/src/bbtkFactory.cxx     |  5 ++--
 kernel/src/bbtkInterpreter.cxx |  9 +++-----
 kernel/src/bbtkRTTI.h          |  6 +++--
 kernel/src/bbtkSystem.h        | 42 ++--------------------------------
 7 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index dcd505a..ec3c604 100644
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -177,7 +177,9 @@ ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H})
 #-----------------------------------------------------------------------------
 TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
+IF(UNIX)
 SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall)
+ENDIF(UNIX)
 
 #IF(UNIX)
 # for gnu linker : version script used to define exported symbols
diff --git a/kernel/src/bbtkAny.h b/kernel/src/bbtkAny.h
index 3c8b534..2d7bb9d 100644
--- a/kernel/src/bbtkAny.h
+++ b/kernel/src/bbtkAny.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAny.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 10:11:27 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -303,7 +303,7 @@ namespace bbtk
     /// Returns true iff the contained type is t
     inline bool contains(TypeInfo t)
     {
-      return ( type() == t );
+      return ( (bool)(type() == t) );
      }
 
     /// Returns true iff any of type ValueType can be held 
diff --git a/kernel/src/bbtkException.h b/kernel/src/bbtkException.h
index 96e04a7..a9fd38f 100644
--- a/kernel/src/bbtkException.h
+++ b/kernel/src/bbtkException.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkException.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/21 14:59:39 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -62,9 +62,10 @@ namespace bbtk
 	std::cerr << "* FILE   : " <<mSourceFile<<std::endl;
       }
     }
+    //const std::string& GetMessage() const { return mMessage; }
     const std::string& GetObject() const { return mObject; }
     const std::string& GetSourceFile() const { return mSourceFile; }
-    const std::string& GetMessage() const { return mMessage; }
+    const std::string& GetErrorMessage() const { return mMessage; }
   private:
     std::string mObject;
     std::string mSourceFile;
diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 3ca2be2..b97670c 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/09/10 09:25:19 $
-Version:   $Revision: 1.38 $
+Date:      $Date: 2008/10/02 12:29:26 $
+Version:   $Revision: 1.39 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -37,6 +37,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 #include <cctype>    // std::toupper
 
+#include <time.h>
 
 namespace bbtk
 {
diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index febf071..59492fc 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/10/02 07:43:20 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -402,9 +402,8 @@ namespace bbtk
       }
     else
       {
-	std::cout << "!!!HERRR bbtk"<<std::endl;
 	std::stringstream mess;
-	mess << "* ERROR : "<<e.GetMessage()<<std::endl;
+	mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
 	if (mFileName.size()) {
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
@@ -433,7 +432,6 @@ namespace bbtk
       }
     else
       {
-	std::cout << "!!!HERRR std"<<std::endl;
 	std::stringstream mess;
 	mess << "* ERROR : "<<e.what()<<std::endl;
 	if (mFileName.size()) {
@@ -465,7 +463,6 @@ namespace bbtk
       }
     else
       {
-	std::cout << "!!!HERRRunk "<<std::endl;
 	std::stringstream mess;
 	mess << "* UNDEFINED ERROR (not a bbtk nor a std exception)" 
 	     << std::endl;
diff --git a/kernel/src/bbtkRTTI.h b/kernel/src/bbtkRTTI.h
index 4fd8eee..ac17280 100644
--- a/kernel/src/bbtkRTTI.h
+++ b/kernel/src/bbtkRTTI.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkRTTI.h,v $
   Language:  C++
-  Date:      $Date: 2008/07/30 09:02:31 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -156,6 +156,7 @@ namespace bbtk
     template <> inline std::string HumanTypeName< std::vector<TYPE> >	\
     (const std::vector<TYPE>&) { return "Vector"+HumanTypeName<TYPE>(); }	
 
+  /*
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(int8_t);
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(uint8_t);
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(int16_t);
@@ -166,6 +167,7 @@ namespace bbtk
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(float);
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(double);
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(std::string);
+*/
 
 /// The bbtk::TypeInfo type is a const ref on std::type_info (which can only be manipulated as such (because typeid returns const std::type_info& and type_info has all constructors private)) 
   typedef const std::type_info& TypeInfo;
diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index 9da0af4..447d9e2 100644
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkSystem.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 07:25:23 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -78,20 +78,6 @@
 // class ClassName
 
 
-/*
-// Useless ?
-#if defined(_WIN32) 
-//&& defined(BUILD_SHARED_LIBS)
-  #ifdef BBTK_EXPORTS2
-    #define BBTK_EXPORT2 export
-  #else
-    #define BBTK_EXPORT2 
-  #endif
-#else
-  #define BBTK_EXPORT2
-#endif // defined(_WIN32) && defined(BUILD_SHARED_LIBS)
-*/
-
 
 
 #if defined(_WIN32) 
@@ -116,30 +102,6 @@
 
 
 
-// ----------------------------------------------------------------------------
-// wx headers
-// ----------------------------------------------------------------------------
-//#include "bbtkWx.h"
-
-/*
-#ifdef _USE_WXWIDGETS_
-#include "wx/wxprec.h"
-#include <wx/datetime.h>
-#ifndef WX_PRECOMP
-#   include <wx/wx.h>
-#endif //WX_PRECOMP
-
-#include <wx/log.h>
-
-#ifdef __WXGTK__
-# include <locale.h>
-#endif //__WXGTK__
-
-#endif //_USE_WXWIDGETS_
-*/
-//-----------------------------------------------------------------------------
-
-
 
 
 //-----------------------------------------------------------------------------
-- 
2.45.1