From: malaterre <malaterre>
Date: Mon, 11 Jul 2005 15:08:18 +0000 (+0000)
Subject: COMP: ooops forgot about feature from VS6 (does not support ostream+string) #2
X-Git-Tag: Version1.2.bp~324
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bd16605c78885c2c2bee82d88b3e2a7bd6707713;p=gdcm.git

COMP: ooops forgot about feature from VS6 (does not support ostream+string) #2
---

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index f5b5647c..9e02d6e3 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 15:05:22 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2005/07/11 15:08:18 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -85,6 +85,10 @@ typedef  unsigned int        uint32_t;
 #endif
 
 #include <string>
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
+/* ostream operator for std::string since VS6 does not provide it*/
+#include <iostream>
+#endif
 
 /// \brief namespace for Grass root DiCoM
 namespace gdcm
@@ -117,8 +121,7 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD;
 
 typedef std::string TagKey;
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
-#include <iostream>
-/* ostream operator for std::string since VS6 does not provide it*/
+// Doing everything within gdcm namespace to avoid polluting 3d party software
 inline std::ostream& operator<<(std::ostream& _O, std::string _val)
 {
   return _O << _val.c_str();