Feature #1774

[bbtk.git] / kernel / src / bbtkRTTI.h

diff --git a/kernel/src/bbtkRTTI.h b/kernel/src/bbtkRTTI.h
index 89366e96d0dde6f1a2c8a9f9703860f5574450de..d7a21d070ee4c3e0fc7764ab40ed2ba88c31a78e 100644 (file)
--- a/kernel/src/bbtkRTTI.h
+++ b/kernel/src/bbtkRTTI.h
@@ -1,20 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbtkRTTI.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/07 11:06:37 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See doc/license.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
+
+
+
 /**
  *\file
  *\brief RTTI tools (system dependent).
@@ -35,6 +55,7 @@
                     (__GNUC_MINOR__ == 1 &&            \
                      __GNUC_PATCHLEVEL__ > 0)))
 #include <cxxabi.h>
+#include <stdlib.h>
 namespace bbtk
 {
   inline std::string demangle_type_name(const char* name) 
@@ -151,9 +172,10 @@ namespace bbtk
   // Human readable strings for std::vector
 #define BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(TYPE)              \
   template <> inline std::string HumanTypeName< std::vector<TYPE> >()  \
-  { return "Vector"+HumanTypeName<TYPE>(); }                           \
+  { std::string t("Vector"); t += HumanTypeName<TYPE>(); return t;}                            \
     template <> inline std::string HumanTypeName< std::vector<TYPE> >  \
-    (const std::vector<TYPE>&) { return "Vector"+HumanTypeName<TYPE>(); }      
+       (const std::vector<TYPE>&) \
+  { std::string t("Vector"); t += HumanTypeName<TYPE>(); return t;}    
 
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(int8_t);
   BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(uint8_t);