X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkSystem.h;h=44f17bfc24f0565e0962545fff968c3e8d786060;hb=ce4491d66577c9daf930cb8744e738e4b7220fe7;hp=cef7b64465d0591122c997136681beba09597a0b;hpb=664e5cdbbcaf3dafa5fc9f206a7094248c289d5a;p=bbtk.git diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h index cef7b64..44f17bf 100644 --- a/kernel/src/bbtkSystem.h +++ b/kernel/src/bbtkSystem.h @@ -1,32 +1,39 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # 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: bbtkSystem.h,v $ Language: C++ - Date: $Date: 2009/06/08 14:50:04 $ - Version: $Revision: 1.14 $ + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.15 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* 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. -* ------------------------------------------------------------------------ */ + /** @@ -102,8 +109,10 @@ #if defined(_WIN32) - // IF NOT DEF THEN INTERNAL COMPILER ERROR WITH BOOST 1.37 ON VISUAL C++ - #define BOOST_SP_NO_SP_CONVERTIBLE + #ifdef _MSC_VER + // IF NOT DEF THEN INTERNAL COMPILER ERROR WITH BOOST 1.37 ON VISUAL C++ + #define BOOST_SP_NO_SP_CONVERTIBLE + #endif #endif #if defined(_WIN32) @@ -111,7 +120,7 @@ //#include "WWW.h" #ifdef BBTK_EXPORT_SYMBOLS #define BBTK_EXPORT __declspec( dllexport ) -#else + #else #define BBTK_EXPORT __declspec( dllimport ) #endif #define BBTK_CDECL __cdecl @@ -139,6 +148,7 @@ namespace bbtk #define BBTK_STRINGIFY(A) #A #define BBTK_STRINGIFY_SYMBOL(A) BBTK_STRINGIFY(A) + extern "C" { BBTK_EXPORT inline const std::string& BBTK_CDECL GetVersion() @@ -148,6 +158,7 @@ namespace bbtk } } + } //----------------------------------------------------------------------------- @@ -172,33 +183,31 @@ typedef unsigned int uint32_t; #ifdef CMAKE_HAVE_STDINT_H #include #else -#ifdef CMAKE_HAVE_INTTYPES_H - // Old system only have this - #include // For uint8_t uint16_t and uint32_t -#else - //#include "XXX.h" -// Broken plateforms do not respect C99 and do not provide those typedef -// Special case for recent Borland compiler, comes with stdint.h -#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) \ - || defined(__MINGW32__) -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; - -/// \todo Find a clever way to deal with int64_t, uint64_t - -#else -#error "Sorry your plateform is not supported" -#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) -#endif // CMAKE_HAVE_INTTYPES_H + #ifdef CMAKE_HAVE_INTTYPES_H + // Old system only have this + #include // For uint8_t uint16_t and uint32_t + #else + //#include "XXX.h" + // Broken plateforms do not respect C99 and do not provide those typedef + // Special case for recent Borland compiler, comes with stdint.h + #if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) \ + || defined(__MINGW32__) + typedef signed char int8_t; + typedef signed short int16_t; + typedef signed int int32_t; + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef unsigned int uint32_t; + /// \todo Find a clever way to deal with int64_t, uint64_t + #else + #error "Sorry your plateform is not supported" + #endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) + #endif // CMAKE_HAVE_INTTYPES_H #endif // CMAKE_HAVE_STDINT_H // Basically for VS6 and bcc 5.5.1: #ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) + #define UINT32_MAX (4294967295U) #endif @@ -222,18 +231,19 @@ namespace bbtk // file separator #if defined(_WIN32) -#define VALID_FILE_SEPARATOR "\\" -#define INVALID_FILE_SEPARATOR "/" -#define VALID_FILE_SEPARATOR_CHAR '\\' -#define INVALID_FILE_SEPARATOR_CHAR '/' + #define VALID_FILE_SEPARATOR "\\" + #define INVALID_FILE_SEPARATOR "/" + #define VALID_FILE_SEPARATOR_CHAR '\\' + #define INVALID_FILE_SEPARATOR_CHAR '/' #else -#define INVALID_FILE_SEPARATOR "\\" -#define VALID_FILE_SEPARATOR "/" -#define INVALID_FILE_SEPARATOR_CHAR '\\' -#define VALID_FILE_SEPARATOR_CHAR '/' + #define INVALID_FILE_SEPARATOR "\\" + #define VALID_FILE_SEPARATOR "/" + #define INVALID_FILE_SEPARATOR_CHAR '\\' + #define VALID_FILE_SEPARATOR_CHAR '/' #endif -#endif + +#endif //__bbtkSystem_h__ //---------------------------- @@ -257,3 +267,5 @@ namespace bbtk * \defgroup interface Graphical User Interface components * \defgroup data Data */ + +