X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDebug.h;h=d3144f6a685cc931b55c9dcf0a72fe059b0aa811;hb=403b2021a56b6afcbf8ddf977dbbfed37ad0d917;hp=85eda8b3cae08ec08fdc3d24982d99946ff3af16;hpb=066996143ee597cc94ffc6d27751301931afad30;p=gdcm.git

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index 85eda8b3..d3144f6a 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/19 14:43:48 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/10/18 12:58:27 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 
 #include "gdcmCommon.h"
 
+#include <iostream>
 #include <sstream>
 #include <fstream>
 #include <assert.h>
@@ -40,7 +41,7 @@ namespace gdcm
  *             proper input and proper output. 
  *             (should not happen, not user controlled)
  * 
- * A debugging message is only show if the flag is on (DebugFlag)
+ * A debugging message is only shown if the flag is on (DebugFlag)
  * This is static var and can be set at beginning of code:
  *         gdcm::Debug::SetDebugOn();
  */
@@ -55,18 +56,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);
 
@@ -193,21 +194,31 @@ public:
 //-----------------------------------------------------------------------------
 //
 // Define GDCM_LEGACY macro to mark legacy methods where they are
-// declared in their class.  Example usage:
+// declared in their class.
+// 
+// WARNING : Don't try to use it with 'inline' methods ! 
+//
+//Example usage:
 //
 //   // @deprecated Replaced by MyOtherMethod() as of gdcm 2.0.
 //   GDCM_LEGACY(void MyMethod());
 #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