COMP: MacOSX does not respect opengroup definition of timeval which has a time_t...

[gdcm.git] / src / gdcmDocEntryArchive.cxx

diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx
index 38ba52d7263c209894186cf34c76241d2498663b..6d74f9155cec0625ac0ad526b7f58447c107001d 100644 (file)
--- a/src/gdcmDocEntryArchive.cxx
+++ b/src/gdcmDocEntryArchive.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 16:05:06 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/01/21 11:40:55 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@ namespace gdcm
 /**
  * \brief Constructor
  */
-DocEntryArchive::DocEntryArchive(Header *header):
+DocEntryArchive::DocEntryArchive(File *header):
    HeaderHT(header->TagHT)
 {
 }
@@ -64,15 +64,15 @@ void DocEntryArchive::Print(std::ostream &os)
 // Public
 /**
  * \brief   Replace in the Header a DocEntry by the new DocEntry. The last
- *          DocEntry is kept in archieve
+ *          DocEntry is kept in archive
  * @param   newEntry New entry to substitute to an other entry of the Header
- * @return  FALSE when an other DocEntry is already archieved with the same
+ * @return  FALSE when an other DocEntry is already archived with the same
  *          generalized key, TRUE otherwise
  */
 bool DocEntryArchive::Push(DocEntry *newEntry)
 {
    if(!newEntry)
-      return(false);
+      return false;
 
    uint16_t gr = newEntry->GetDictEntry()->GetGroup();
    uint16_t elt = newEntry->GetDictEntry()->GetElement();
@@ -94,22 +94,22 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
       // Set the new DocEntry
       HeaderHT[key] = newEntry;
 
-      return(true);
+      return true;
    }
-   return(false);
+   return false;
 }
 
 /**
  * \brief   Replace in the Header a DocEntry by the new DocEntry. The last
  *          DocEntry is kept in archieve
  * @param   group   Group number of the Entry 
- * @param   element  Element number of the Entry
- * @return  FALSE when an other DocEntry is already archieved with the same
+ * @param   elem  Element number of the Entry
+ * @return  FALSE when an other DocEntry is already archived with the same
  *          generalized key, TRUE otherwise
  */
-bool DocEntryArchive::Push(uint16_t group,uint16_t element)
+bool DocEntryArchive::Push(uint16_t group,uint16_t elem)
 {
-   std::string key = DictEntry::TranslateToKey(group,element);
+   std::string key = DictEntry::TranslateToKey(group,elem);
 
    if( Archive.find(key)==Archive.end() )
    {
@@ -121,22 +121,22 @@ bool DocEntryArchive::Push(uint16_t group,uint16_t element)
          HeaderHT.erase(it);
       }
 
-      return(true);
+      return true;
    }
-   return(false);
+   return false;
 }
 
 /**
  * \brief   Restore in the Header the DocEntry that have the generalized key. 
  *          The old entry is destroyed.
  * @param   group   Group number of the Entry 
- * @param   element  Element number of the Entry
- * @return  FALSE when the generalized key isn't in the archieve, 
+ * @param   elem  Element number of the Entry
+ * @return  FALSE when the generalized key isn't in the archive, 
  *          TRUE otherwise
  */
-bool DocEntryArchive::Restore(uint16_t group,uint16_t element)
+bool DocEntryArchive::Restore(uint16_t group,uint16_t elem)
 {
-   std::string key=DictEntry::TranslateToKey(group,element);
+   std::string key=DictEntry::TranslateToKey(group,elem);
 
    TagDocEntryHT::iterator restoreIt=Archive.find(key);
    if( restoreIt!=Archive.end() )
@@ -158,16 +158,16 @@ bool DocEntryArchive::Restore(uint16_t group,uint16_t element)
 
       Archive.erase(restoreIt);
 
-      return(true);
+      return true;
    }
-   return(false);
+   return false;
 }
 
 /**
- * \brief   Remove all DocEntry that are in the archive. The entries aren't 
- *          restored but only destroyed.
+ * \brief   Remove all DocEntry that are in the archive.  
+ *          The entries aren't restored but only destroyed.
  */
-void DocEntryArchive::ClearArchive(void)
+void DocEntryArchive::ClearArchive( )
 {
    for(TagDocEntryHT::iterator it = Archive.begin();
        it!=Archive.end();