From: malaterre <malaterre>
Date: Sat, 27 Oct 2007 17:34:16 +0000 (+0000)
Subject: COMP: getting borland to compile templated code
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=712736081b4eff5259c74782e6183660fd0f5c92;p=gdcm.git

COMP: getting borland to compile templated code
---

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
index 52da0972..72de0921 100644
--- a/Example/CMakeLists.txt
+++ b/Example/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(EXAMPLE_SOURCES
   exSerieHelper
   exXCoherentFileSet
   exMoveImagesToSingleSerieUID
-  exExtractSegmentedPalette
+  #exExtractSegmentedPalette
   exMakeIcon
   
   # the following are utilities
diff --git a/src/gdcmSegmentedPalette.h b/src/gdcmSegmentedPalette.h
index 8ece56e6..c2d9fa14 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/26 09:00:31 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2007/10/27 17:34:16 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,6 +54,14 @@
 #define GDCM_TYPENAME typename
 #endif
 
+// Hack for Borland
+#if defined(__BORLANDC__)
+#define GDCM_TYPENAME2
+#else
+#define GDCM_TYPENAME2 typename
+#endif
+
+
 namespace GDCM_NAME_SPACE
 {
 // Long stody short: Sun compiler only provide the second interface of std::distance, since the implemenation
@@ -206,7 +214,7 @@ namespace GDCM_NAME_SPACE
         }
         GDCM_TYPENAME Segment<EntryType>::SegmentMap instances;
         std::transform(segments.begin(), segments.end(),
-            std::inserter(instances, instances.end()), GDCM_TYPENAME Segment<EntryType>::ToMap());
+            std::inserter(instances, instances.end()), GDCM_TYPENAME2 Segment<EntryType>::ToMap());
         GDCM_TYPENAME SegmentList::iterator ppSeg = segments.begin();
         GDCM_TYPENAME SegmentList::iterator endOfSegments = segments.end();
         for ( ; ppSeg != endOfSegments; ++ppSeg ) {