X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=c7f7d65f6cda9230b9b20370108f69610129aa77;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=de857ed3a281bbff8316e1666f6b5dacba083b40;hpb=eba2d1d91686d8e5ca1e3dc019742032b450c3b2;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index de857ed3..c7f7d65f 100644 --- a/src/gdcmDebug.h +++ b/src/gdcmDebug.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDebug.h,v $ Language: C++ - Date: $Date: 2005/07/21 05:02:11 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/09/02 07:10:03 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,18 +55,18 @@ public: static void SetDebugFlag (bool flag); static bool GetDebugFlag (); /// \brief Sets the Debug Flag to true - static void DebugOn () { SetDebugFlag(true); }; + static void DebugOn () { SetDebugFlag(true); } /// \brief Sets the Debug Flag to false - static void DebugOff () { SetDebugFlag(false); }; + static void DebugOff () { SetDebugFlag(false); } /// \brief This is a global flag that controls if debug are redirected /// to a file or not static void SetDebugToFile (bool flag); static bool GetDebugToFile (); /// \brief Next debug messages will be sent in the debug file - static void DebugToFileOn () { SetDebugToFile(true); }; + static void DebugToFileOn () { SetDebugToFile(true); } /// \brief Next debug messages will be sent in the standard output - static void DebugToFileOff () { SetDebugToFile(false); }; + static void DebugToFileOff () { SetDebugToFile(false); } static void SetDebugFilename (std::string const &filename); @@ -204,14 +204,20 @@ public: #if defined(GDCM_LEGACY_REMOVE) // Remove legacy methods completely. # define GDCM_LEGACY(method) -#elif defined(GDCM_LEGACY_SILENT) +#elif defined(GDCM_LEGACY_SILENT) || defined(SWIG) // Provide legacy methods with no warnings. # define GDCM_LEGACY(method) method #else // Setup compile-time warnings for uses of deprecated methods if // possible on this compiler. # if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#if defined(__APPLE__) && (__GNUC__ == 3) && (__GNUC_MINOR__ == 3) +// Seems like there is a bug in APPLE gcc for deprecated attribute and ctor +// This is fixed in g++ 4.0 (Tiger) +# define GDCM_LEGACY(method) method +#else # define GDCM_LEGACY(method) method __attribute__((deprecated)) +#endif # elif defined(_MSC_VER) && _MSC_VER >= 1300 # define GDCM_LEGACY(method) __declspec(deprecated) method # else