mhoyt 2004/08/31 11:29:18
Modified: c/src/xalanc/Include STLHelper.hpp XalanMap.hpp
Log:
Fix XalanMap related compiler errors/warning
Revision Changes Path
1.6 +10 -0 xml-xalan/c/src/xalanc/Include/STLHelper.hpp
Index: STLHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/STLHelper.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- STLHelper.hpp 31 Aug 2004 14:20:26 -0000 1.5
+++ STLHelper.hpp 31 Aug 2004 18:29:18 -0000 1.6
@@ -287,6 +287,11 @@
template<class T>
struct equal_null_terminated_arrays : public XALAN_STD_QUALIFIER
binary_function<const T*, const T*, bool>
{
+ typedef XALAN_STD_QUALIFIER binary_function<const T*, const T*, bool>
BaseClassType;
+
+ typedef typename BaseClassType::result_type
result_type;
+ typedef typename BaseClassType::first_argument_type
first_argument_type;
+ typedef typename BaseClassType::second_argument_type
second_argument_type;
/**
* Compare the values of two objects.
*
@@ -327,6 +332,11 @@
template <class T>
struct hash_null_terminated_arrays : public XALAN_STD_QUALIFIER
unary_function<const T*, size_t>
{
+ typedef XALAN_STD_QUALIFIER unary_function<const T*, size_t>
BaseClassType;
+
+ typedef typename BaseClassType::result_type
result_type;
+ typedef typename BaseClassType::argument_type argument_type;
+
result_type
operator() (argument_type theKey) const
{
1.2 +10 -21 xml-xalan/c/src/xalanc/Include/XalanMap.hpp
Index: XalanMap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanMap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanMap.hpp 26 Aug 2004 18:48:44 -0000 1.1
+++ XalanMap.hpp 31 Aug 2004 18:29:18 -0000 1.2
@@ -63,17 +63,6 @@
};
template <class Key>
-class XalanHashPointer
-{
-public:
- size_type operator() (const Key *key) const
- {
- assert(key != 0);
- return Hash<Key>()(*key);
- }
-};
-
-template <class Key>
struct XalanHashMemberPointer
{
@@ -133,16 +122,16 @@
typedef XalanVector<typename EntryListType::iterator>
EntryPosVectorType;
- template<class Value, class Ref, class Ptr, class Iterator, class Map>
+ template<class ValueType, class Ref, class Ptr, class Iterator, class
Map>
struct iterator_base
{
- typedef Value value_type;
+ typedef ValueType value_type;
typedef Ref reference_type;
typedef Ptr pointer_type;
typedef ThisType MapType;
- typedef iterator_base<value_type, reference_type, pointer_type,
Iterator, Map> ThisType;
+ typedef iterator_base<value_type, reference_type, pointer_type,
Iterator, Map> IteratorType;
typedef iterator_base<value_type, value_type&, value_type*,
EntryListIterator, MapType> iterator;
@@ -160,7 +149,7 @@
{
}
- const ThisType & operator=(const ThisType& theRhs)
+ const IteratorType & operator=(const IteratorType& theRhs)
{
m_map = theRhs.m_map;
m_bucketPos = theRhs.m_bucketPos;
@@ -172,25 +161,25 @@
return *m_bucketPos;
}
- int operator!=(const ThisType& theRhs) const
+ int operator!=(const IteratorType& theRhs) const
{
return !operator==(theRhs);
}
- int operator==(const ThisType& theRhs) const
+ int operator==(const IteratorType& theRhs) const
{
return (theRhs.m_map == m_map)
&& (theRhs.m_bucketPos == m_bucketPos);
}
- ThisType& operator++()
+ IteratorType& operator++()
{
m_bucketPos++;
return *this;
}
- typename Map* m_map;
- typename Iterator m_bucketPos;
+ Map* m_map;
+ Iterator m_bucketPos;
};
typedef iterator_base<
@@ -424,7 +413,7 @@
void doRemoveEntry(const EntryListIterator & toRemoveIter)
{
size_type index = toRemoveIter->bucketIndex;
- EntryListType::iterator nextPosition =
++(EntryListType::iterator(toRemoveIter));
+ EntryListIterator nextPosition =
++(EntryListIterator(toRemoveIter));
if (m_buckets[index] == toRemoveIter)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
