From: malaterre <malaterre>
Date: Tue, 30 Oct 2007 13:31:54 +0000 (+0000)
Subject: COMP: ooops while fixing comp with borland I broke VS6 compilation
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f07ed49bab33842d63001e78abbbcfdd95e9dcc8;p=gdcm.git

COMP: ooops while fixing comp with borland I broke VS6 compilation
---

diff --git a/src/gdcmSegmentedPalette.h b/src/gdcmSegmentedPalette.h
index 3c9c1387..99cbe9f0 100644
--- a/src/gdcmSegmentedPalette.h
+++ b/src/gdcmSegmentedPalette.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSegmentedPalette.h,v $
   Language:  C++
-  Date:      $Date: 2007/10/30 09:14:42 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2007/10/30 13:31:54 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,7 +55,7 @@
 #endif
 
 // Hack for Borland
-#if defined(__BORLANDC__)
+#if (defined(_MSC_VER) && (_MSC_VER < 1310)) || defined(__BORLANDC__)
 #define GDCM_TYPENAME2
 #else
 #define GDCM_TYPENAME2 typename