X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkSystem.h;h=72f4e6f7e9efbf45c9a419ab22ed1895b51619b3;hb=6e6b9b173b1eedc7402a778fb6d3b00e8a942fd3;hp=e1857d18b27d23499de1df0c723d1fb2b98cb6ca;hpb=97b08ef9b0c2a60c4d1f619f6bfef2996afdcab3;p=bbtk.git diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h index e1857d1..72f4e6f 100644 --- a/kernel/src/bbtkSystem.h +++ b/kernel/src/bbtkSystem.h @@ -1,21 +1,34 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkSystem.h,v $ Language: C++ - Date: $Date: 2008/07/24 14:37:05 $ - 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 - 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: 2009/01/08 10:18:29 $ + Version: $Revision: 1.12 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* 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. +* ------------------------------------------------------------------------ */ + + /** *\file *\brief contains all the OS depending stuff @@ -52,7 +65,15 @@ // produce errors if applied using infix notation #pragma warning ( disable : 4284 ) // 'type' : forcing value to bool 'true' or 'false' (performance warning) +// Has revealed a real error ! +// bbSignalOutputModification(bool) called rather than +// bbSignalOutputModification(const std::string&, bool = true) +// when invoking bbSignalOutputModification("Out") +// KEEP IT ! // //#pragma warning ( disable : 4800 ) +// To avoid warning : +// 'PACKAGE_NAMEGetPackage' has C-linkage specified, but returns UDT 'boost::shared_ptr' which is incompatible with C +#pragma warning ( disable : 4190 ) #endif //_MSC_VER @@ -78,20 +99,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 +123,6 @@ -// ---------------------------------------------------------------------------- -// wx headers -// ---------------------------------------------------------------------------- -//#include "bbtkWx.h" - -/* -#ifdef _USE_WXWIDGETS_ -#include "wx/wxprec.h" -#include -#ifndef WX_PRECOMP -# include -#endif //WX_PRECOMP - -#include - -#ifdef __WXGTK__ -# include -#endif //__WXGTK__ - -#endif //_USE_WXWIDGETS_ -*/ -//----------------------------------------------------------------------------- - - //----------------------------------------------------------------------------- @@ -232,4 +215,29 @@ namespace bbtk } // 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 '/' +#else +#define INVALID_FILE_SEPARATOR "\\" +#define VALID_FILE_SEPARATOR "/" +#define INVALID_FILE_SEPARATOR_CHAR '\\' +#define VALID_FILE_SEPARATOR_CHAR '/' +#endif + +#endif + + +//---------------------------- +#ifndef _WIN32 +#include //for access, unlink +#else +#include //for _access on Win32 +#endif + +#ifdef _MSC_VER +# define access _access #endif