Import Geant4 4.0.0 source tree

source/g3tog4/src/G3MatTable.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G3MatTable.cc,v 1.13.2.1 2001/06/28 19:08:03 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G3MatTable.cc,v 1.15 2001/07/16 15:38:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-04-00 $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -35,13 +35,13 @@ G3MatTable::G3MatTable()
 
 G3MatTable::~G3MatTable()
 {
-  fMatVector->clearAndDestroy();
+  Clear();
   delete fMatVector;
 }
 
 G4Material* G3MatTable::get(G4int id) const
 {
-  for (size_t i=0; i< fMatVector->entries(); i++) {
+  for (size_t i=0; i< fMatVector->size(); i++) {
     G3MatTableEntry* mte = (*fMatVector)[i];
     if (id == mte->GetID()) return mte->GetMaterial();
   }
@@ -51,10 +51,22 @@ G4Material* G3MatTable::get(G4int id) const
 void G3MatTable::put(G4int id, G4Material* material)
 {
   G3MatTableEntry* mte = new G3MatTableEntry(id, material);
-  fMatVector->insert(mte);
+  fMatVector->push_back(mte);
 }
 
 void G3MatTable::Clear()
 {
-  fMatVector->clearAndDestroy();
+  G3MatTableEntry* a;
+  while (fMatVector->size()>0) {
+    a = fMatVector->back();
+    fMatVector->pop_back();
+    for (G3MaterialVector::iterator i=fMatVector->begin();
+                                    i!=fMatVector->end(); i++){
+      if (*i==a) {
+	fMatVector->erase(i);
+	i--;
+      }
+    } 
+    if ( a )  delete a;    
+  } 
 }