From 5603c3d2b4ba248da2ec05555c5f076055041792 Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 6 Jan 2005 20:33:55 +0000 Subject: [PATCH] COMP: Fix compilation on Win32: c:\Dashboards\My Tests\gdcm\src\gdcmDicomDir.h(78) : error C2086: 'm' : redefinition c:\Dashboards\My Tests\gdcm\src\gdcmDicomDir.h(78) : fatal error C1903: unable to recover from previous error(s); stopping compilation --- src/gdcmDicomDir.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index 66bfe02f..572d6f97 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.h,v $ Language: C++ - Date: $Date: 2005/01/06 20:03:26 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/01/06 20:33:55 $ + 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 @@ -73,15 +73,15 @@ public: // Note: the DicomDir:: namespace prefix is needed by Swig in the // following method declarations. Refer to gdcmPython/gdcm.i // for the reasons of this unecessary notation at C++ level. - void SetStartMethod( DicomDir::Method *m, - void* = NULL, - DicomDir::Method *m = NULL ); - void SetProgressMethod( DicomDir::Method *m, - void* = NULL, - DicomDir::Method *m = NULL ); - void SetEndMethod( DicomDir::Method *m, - void* = NULL, - DicomDir::Method *m = NULL ); + void SetStartMethod( DicomDir::Method *method, + void *arg = NULL, + DicomDir::Method *argDelete = NULL ); + void SetProgressMethod( DicomDir::Method *method, + void *arg = NULL, + DicomDir::Method *argDelete = NULL ); + void SetEndMethod( DicomDir::Method *method, + void *arg = NULL, + DicomDir::Method *argDelete = NULL ); void SetStartMethodArgDelete( DicomDir::Method *m ); void SetProgressMethodArgDelete( DicomDir::Method *m ); void SetEndMethodArgDelete( DicomDir::Method *m ); -- 2.48.1