COMP: Fix comp on gcc295

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index d3bb9197eb81d9e338701beae23e38e5006c0cf6..bc0dddfd3dd246086632876d7c3db935d81b5aea 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2004/11/16 02:54:35 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,8 +36,8 @@ namespace gdcm
 */
 
 DictEntry::DictEntry(uint16_t group, uint16_t element,
-                             std::string vr, std::string fourth,
-                             std::string name)
+                     TagName const & vr, TagName const & fourth,
+                     TagName const & name)
 {
    Group   = group;
    Element = element;
@@ -61,9 +61,7 @@ DictEntry::DictEntry(uint16_t group, uint16_t element,
  */
 TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
 {
-   TagKey key = Util::Format("%04x|%04x", group , element);
-
-   return key;
+   return Util::Format("%04x|%04x", group, element);
 }
 
 //-----------------------------------------------------------------------------
@@ -72,7 +70,7 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t element)
  * \            is unset then overwrite it.
  * @param vr    New V(alue) R(epresentation) to be set.
  */
-void DictEntry::SetVR(std::string const & vr) 
+void DictEntry::SetVR(TagName const & vr) 
 {
    if ( IsVRUnknown() )
    {