cvs commit: xml-xalan/c/src/PlatformSupport AttributeListImpl.cpp

[dbertoni]

dbertoni    00/12/01 14:00:07

  Modified:    c/src/PlatformSupport AttributeListImpl.cpp
  Log:
  Changes for vector iterator issues.
  
  Revision  Changes    Path
  1.16      +8 -8      xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp
  
  Index: AttributeListImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AttributeListImpl.cpp     2000/11/20 20:04:25     1.15
  +++ AttributeListImpl.cpp     2000/12/01 22:00:07     1.16
  @@ -236,7 +236,7 @@
   {
        assert(index < getLength());
   
  -     return m_AttributeVector[index]->m_Name.begin();
  +     return &*m_AttributeVector[index]->m_Name.begin();
   }
   
   
  @@ -246,7 +246,7 @@
   {
        assert(index < getLength());
   
  -     return m_AttributeVector[index]->m_Type.begin();
  +     return &*m_AttributeVector[index]->m_Type.begin();
   }
   
   
  @@ -256,7 +256,7 @@
   {
        assert(index < getLength());
   
  -     return m_AttributeVector[index]->m_Value.begin();
  +     return &*m_AttributeVector[index]->m_Value.begin();
   }
   
   
  @@ -271,7 +271,7 @@
        bool
        operator()(const AttributeListImpl::AttributeVectorEntry*       
theEntry) const
        {
  -             return equals(theEntry->m_Name.begin(), m_name);
  +             return equals(&*theEntry->m_Name.begin(), m_name);
        }
   
   private:
  @@ -299,7 +299,7 @@
        if (i != m_AttributeVector.end())
        {
                // Found it, so return a pointer to the type.
  -             return (*i)->m_Type.begin();
  +             return &*(*i)->m_Type.begin();
        }
        else
        {
  @@ -312,7 +312,7 @@
   const XMLCh*
   AttributeListImpl::getValue(const char* const name) const
   {
  -     return getValue(MakeXalanDOMCharVector(name).begin());
  +     return getValue(&*MakeXalanDOMCharVector(name).begin());
   }
   
   
  @@ -335,7 +335,7 @@
        if (i != m_AttributeVector.end())
        {
                // Found it, so return a pointer to the value.
  -             return (*i)->m_Value.begin();
  +             return &*(*i)->m_Value.begin();
        }
        else
        {
  @@ -400,7 +400,7 @@
        if (i != m_AttributeVector.end())
        {
                // This is a special optimization for type, since it's (almost) 
always "CDATA".
  -             if (equals(type, (*i)->m_Type.begin()) == false)
  +             if (equals(type, &*(*i)->m_Type.begin()) == false)
                {
                        // If necessary, create the a new vector and swap them. 
 Otherwise,
                        // just copy the new data in.