X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmMacro.h;h=2ff5cfba3ef08ddcfa76469b5ad9769e9023c0d4;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=5798178fc17494c1ee0a8e48bfea5851f4b29b75;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git

diff --git a/src/gdcmMacro.h b/src/gdcmMacro.h
index 5798178f..2ff5cfba 100644
--- a/src/gdcmMacro.h
+++ b/src/gdcmMacro.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmMacro.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:34 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,36 +16,36 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMMACRO_H
-#define GDCMMACRO_H
+#ifndef _GDCMMACRO_H_
+#define _GDCMMACRO_H_
 
 //-----------------------------------------------------------------------------
-#define gdcmTypeMacro(type) \
-   private : \
+#define gdcmTypeMacro(type)               \
+   private :                              \
       type(type &); /* Not implemented */ \
       type &operator=(type &) /* Not implemented */
 
-#define gdcmNewMacro(type) \
-   public : \
+#define gdcmNewMacro(type)                \
+   public :                               \
       static type *New() {return new type(); } /* Not implemented */
 
 //-----------------------------------------------------------------------------
 //
 // Define GDCM_LEGACY macro to mark legacy methods where they are
 // declared in their class.
-// 
-// WARNING : Don't try to use it with 'inline' methods ! 
+//
+// 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());
+//   GDCM_LEGACY(void MyMethod())
 #if defined(GDCM_LEGACY_REMOVE)
   // Remove legacy methods completely.
 # define GDCM_LEGACY(method)
-#elif defined(GDCM_LEGACY_SILENT) || defined(SWIG)
+#elif defined(GDCM_LEGACY_SILENT)
   // Provide legacy methods with no warnings.
-# define GDCM_LEGACY(method) method
+# define GDCM_LEGACY(method) method;
 #else
   // Setup compile-time warnings for uses of deprecated methods if
   // possible on this compiler.
@@ -53,14 +53,14 @@
 #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
+#  define GDCM_LEGACY(method) method;
 #else
-#  define GDCM_LEGACY(method) method __attribute__((deprecated))
+#  define GDCM_LEGACY(method) method __attribute__((deprecated));
 #endif
 # elif defined(_MSC_VER) && _MSC_VER >= 1300
-#  define GDCM_LEGACY(method) __declspec(deprecated) method
+#  define GDCM_LEGACY(method) __declspec(deprecated) method;
 # else
-#  define GDCM_LEGACY(method) method
+#  define GDCM_LEGACY(method) method;
 # endif
 #endif