ENH: Rework the GDCM_LEGACY mechanism to allow use of stronger warnings flags

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 869bac7..2a19ffd 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2006/02/16 20:06:13 $
-  Version:   $Revision: 1.74 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  Version:   $Revision: 1.75 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -56,7 +56,7 @@ public:
 /// \brief Constructs a DicomDir with a RefCounter
    static DicomDir *New() {return new DicomDir();}
 
-   GDCM_LEGACY( bool Load(std::string const &filename) );
+   GDCM_LEGACY( bool Load(std::string const &filename) )
    bool Load( );
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
    
@@ -115,7 +115,7 @@ public:
    
 protected:
    DicomDir(); 
-   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ); 
+   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) )
    ~DicomDir();
 
    void CreateDicomDirChainedList(std::string const &path);

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index eaf2d26..b3bb6ae 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2006/03/29 16:13:00 $
-  Version:   $Revision: 1.125 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  Version:   $Revision: 1.126 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -104,7 +104,7 @@ public:
    static File *New() {return new File();}
 
    // Loading
-   GDCM_LEGACY(bool Load( std::string const &filename ));
+   GDCM_LEGACY(bool Load( std::string const &filename ))
    bool Load(); 
    // Standard values and informations contained in the header
    bool IsReadable();

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index b072c38..684f3ea 100644 (file)
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2006/05/02 11:14:05 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -88,7 +88,7 @@ public:
    uint8_t *GetImageData();
    uint8_t *GetImageDataRaw();
 
-   GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize));
+   GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize))
 
    void SetImageData(uint8_t *data, size_t expectedSize);
 

diff --git a/src/gdcmMacro.h b/src/gdcmMacro.h
index edbcf2d..5719b3d 100644 (file)
--- a/src/gdcmMacro.h
+++ b/src/gdcmMacro.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmMacro.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  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
@@ -33,8 +33,8 @@
 //
 // 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:
 //
@@ -45,7 +45,7 @@
 # define GDCM_LEGACY(method)
 #elif defined(GDCM_LEGACY_SILENT) || defined(SWIG)
   // 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
 

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 757f20b..2743a11 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2006/03/30 16:51:29 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2006/05/11 19:49:38 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -95,9 +95,9 @@ public:
    const FileList &GetFileList()
                            { return *SingleSerieUIDFileSetHT.begin()->second; }
   
-   GDCM_LEGACY(   FileList *GetFirstCoherentFileList()  );
-   GDCM_LEGACY(   FileList *GetNextCoherentFileList()   );
-   GDCM_LEGACY(   FileList *GetCoherentFileList(std::string serieUID)  );
+   GDCM_LEGACY(   FileList *GetFirstCoherentFileList()  )
+   GDCM_LEGACY(   FileList *GetNextCoherentFileList()   )
+   GDCM_LEGACY(   FileList *GetCoherentFileList(std::string serieUID)  )
 
    FileList *GetFirstSingleSerieUIDFileSet();
    FileList *GetNextSingleSerieUIDFileSet();