From 436130ef5084e737c29470409da795832ed2129b Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 6 Oct 2008 07:55:50 +0000 Subject: [PATCH] fixed macro BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME which did not compile on Windows --- kernel/src/bbtkRTTI.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/src/bbtkRTTI.h b/kernel/src/bbtkRTTI.h index ac17280..f068fa0 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/10/02 12:29:26 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/10/06 07:55:50 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -152,11 +152,11 @@ namespace bbtk // Human readable strings for std::vector #define BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(TYPE) \ template <> inline std::string HumanTypeName< std::vector >() \ - { return "Vector"+HumanTypeName(); } \ + { std::string t("Vector"); t += HumanTypeName(); return t;} \ template <> inline std::string HumanTypeName< std::vector > \ - (const std::vector&) { return "Vector"+HumanTypeName(); } + (const std::vector&) \ + { std::string t("Vector"); t += HumanTypeName(); return t;} - /* 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); @@ -167,7 +167,6 @@ 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; -- 2.45.1