From 8758f1c110cbbb2e71c71d6f722d36a144e02db9 Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Tue, 2 Nov 2004 03:10:32 +0000
Subject: [PATCH] BUG: Fix compilation problem with VS7. Unknow was not
 /really/ within gdcm namespace, now this should be fixed. Thanks to
 Jean-Michel Rouet for patch

---
 src/gdcmCommon.h   | 14 ++++++++------
 src/gdcmDicomDir.h |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 36ceb573..e180d3cb 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:44 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2004/11/02 03:10:32 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -80,6 +80,10 @@ typedef  unsigned int   uint32_t;
 #  include <sstream>
 #endif
 
+#include <string>
+
+namespace gdcm
+{
 
 // Centralize information about the gdcm dictionary in only one file:
 #ifndef PUB_DICT_PATH
@@ -91,9 +95,7 @@ typedef  unsigned int   uint32_t;
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-#include <string>
-
-const std::string GDCM_UNFOUND   = "gdcm::Unfound";   /// MEMORY LEAK
+const std::string GDCM_UNFOUND   = "gdcm::Unfound";
 const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
 const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
 const std::string GDCM_UNREAD    = "gdcm::UnRead";
@@ -135,6 +137,6 @@ enum FileType {
       ACR,
       ACR_LIBIDO
 };
-
+} //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif
diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index edbc7b4b..56f8a083 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:47:43 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2004/11/02 03:10:32 $
+  Version:   $Revision: 1.36 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,7 +34,7 @@ namespace gdcm
 typedef std::list<DicomDirPatient*>   ListDicomDirPatient;
 typedef std::vector<Document*>  VectDocument;
 
-typedef GDCM_EXPORT void(Method)(void* = NULL);
+typedef GDCM_EXPORT void(Method)(void*);
 //-----------------------------------------------------------------------------
 
 /**
-- 
2.46.0