cvs commit: xml-xalan/c/src/xalanc/Include XalanSet.hpp

[mhoyt]

mhoyt       2004/10/01 18:03:47

  Modified:    c/src/xalanc/Include XalanSet.hpp
  Log:
  Changes to enable HP/aCC build:  no support for std::pair, require postfix ++
  
  Revision  Changes    Path
  1.2       +16 -8     xml-xalan/c/src/xalanc/Include/XalanSet.hpp
  
  Index: XalanSet.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanSet.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XalanSet.hpp      30 Sep 2004 22:28:10 -0000      1.1
  +++ XalanSet.hpp      2 Oct 2004 01:03:47 -0000       1.2
  @@ -37,20 +37,20 @@
   
   
   
  -template <class MapIterator>
  +template <class Value, class MapIterator>
   struct XalanSetIterator
   {
  -    typedef typename MapIterator::value_type::first_type  value_type;
  +    typedef Value  value_type;
   
  -    typedef value_type&     reference;
  -    typedef value_type*     pointer;
  +    typedef Value& reference;
  +    typedef Value* pointer;
   
       XalanSetIterator(const MapIterator & iter) :
           m_mapIterator(iter)
       {
       }
   
  -    value_type& operator*() const
  +    reference operator*() const
       {
           return m_mapIterator->first;
       };
  @@ -71,6 +71,13 @@
           return *this;
       }
   
  +    XalanSetIterator operator++(int)
  +    {
  +        XalanSetIterator orig(m_mapIterator);
  +        ++(*this);
  +        return orig;
  +    }
  +
   protected:
       MapIterator m_mapIterator;
   };
  @@ -95,8 +102,8 @@
   
       typedef XalanMap<value_type, bool>  SetMapType;
   
  -    typedef XalanSetIterator<typename SetMapType::iterator>         iterator;
  -    typedef XalanSetIterator<typename SetMapType::const_iterator>   
const_iterator;
  +    typedef XalanSetIterator<value_type, typename SetMapType::iterator>      
       iterator;
  +    typedef XalanSetIterator<const value_type, typename 
SetMapType::const_iterator> const_iterator;
   
       XalanSet(MemoryManagerType * theMemoryManager = 0) :
           m_map(theMemoryManager)
  @@ -136,7 +143,8 @@
   
       void insert(const value_type& value)
       {
  -        m_map.insert(SetMapType::value_type(value,true));
  +     typedef typename SetMapType::value_type MapValueType;
  +        m_map.insert(MapValueType(value,true));
       }
   
       size_type erase(const value_type& value)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]