Changeset 95 for XMLIO_V2/dev/dev_rv/xmlio_container.hpp

Timestamp:

06/04/10 12:02:47 (14 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/xmlio_container.hpp (modified) (4 diffs)

XMLIO_V2/dev/dev_rv/xmlio_container.hpp

@@ -19 +19 @@
    template<class Key, class Mapped, class HashFunc = Hash<Key> >
       class ExHashMap
-         : private HashMap<Key, Mapped, Hash<Key> >
+         : private HashMap<Key, Mapped*, Hash<Key> >
    {
       public :
-         ExHashMap() :  HashMap<Key, Mapped, Hash<Key> >(), _elemList()
+         ExHashMap() :  HashMap<Key, Mapped*, Hash<Key> >(), _elemList()
          {/* Ne rien faire de plus */}
                
-         Mapped& operator[] (const Key& kval) throw (XMLIOUndefinedValueException)
+         Mapped* operator[] (const Key& kval) throw (XMLIOUndefinedValueException)
          { 
             if(!hasMappedValue(kval))
@@ -44 +44 @@
       protected :
       
-         bool addValue(const Key& kval, Mapped& element)
+         bool addValue(const Key& kval, Mapped* element)
          {
             pair<typename ExHashMap::Iterator,bool> p = this->insert(make_pair (kval,element));
@@ -51 +51 @@
          }
          
-         bool addValue(Mapped& element)
-         {   this->_elemList.insert(this->_elemList.end(), &element);   return (true);   }   
+         bool addValue(Mapped* element)
+         {   this->_elemList.insert(this->_elemList.end(), element);   return (true);   }   
          
          
-         void removeValue(const Key& kval)
-         { Mapped& element = find(kval)->second; removeValue(element); this->erase(kval);   }
+         void removeValue(const Key& kval) // Non testé
+         { Mapped* element = find(kval)->second; removeValue(element); this->erase(kval); }
          
-         void removeValue(const Mapped& element)
+         void removeValue(const Mapped* element) // Non testé
          {
             for (int i = 0; i < this->_elemList.size(); i++)             
-               if (*this->_elemList[i] == element ) this->_elemList.erase(this->_elemList.begin()+i);
+               if (*this->_elemList[i] == element )
+                  this->_elemList.erase(this->_elemList.begin()+i);
+                  
+            delete element;
          }
          
@@ -80 +83 @@
          {/* Ne rien faire de plus */}   
          
-         bool addObject(Mapped& element)
-         { if(element.hasId()) return(addValue(element.getId(), element));   return(addValue(element)); }
-         
-         bool addPtrObject(Mapped element)
+         bool addObject(Mapped* element)
          { if(element->hasId()) return(addValue(element->getId(), element));   return(addValue(element)); }
-         
+                  
          bool removeObject(const string& kval)
          {