From: malaterre <malaterre>
Date: Thu, 28 Oct 2004 19:53:28 +0000 (+0000)
Subject: BUG: Previous code did not compile with all (=busted) compilers
X-Git-Tag: Version0.6.bp~31
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c77dd6febbf12b5b0d5401008ced0c575b61a5f7;p=gdcm.git

BUG: Previous code did not compile with all (=busted) compilers
---

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index ffcd2dc7..7155f6ef 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 22:47:20 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2004/10/28 19:53:28 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -154,10 +154,10 @@ bool Dict::AddNewEntry(DictEntry const & newEntry)
    else 
    {
       KeyHt.insert( 
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (newEntry.GetKey(), newEntry));
       NameHt.insert(
-         TagNameHT::value_type<TagName, DictEntry>
+         std::map<TagName, DictEntry>::value_type
             (newEntry.GetName(), newEntry ));
       return true;
    }
@@ -174,10 +174,10 @@ bool Dict::ReplaceEntry(DictEntry const & newEntry)
    if ( RemoveEntry(newEntry.GetKey()) )
    {
       KeyHt.insert( 
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (newEntry.GetKey(), newEntry));
       NameHt.insert(
-         TagNameHT::value_type<TagName, DictEntry>
+         std::map<TagName, DictEntry>::value_type
             (newEntry.GetName(), newEntry ));
        return true;
    } 
diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 04238f0b..3b3c53c6 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 22:47:20 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2004/10/28 19:53:29 $
+  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
@@ -183,7 +183,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
    {
       DictEntry ent(group, element, vr, fourth, name);
       VirtualEntry.insert(
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (tag, ent));
       entry = &(VirtualEntry.find(tag)->second);
    }