dbertoni 2004/09/02 14:53:34
Modified: c/src/xalanc/Include XalanMap.hpp
Log:
Added default constructor for Entry, which is required objects stored in
standard collections. Added missing std:: qualifier.
Revision Changes Path
1.3 +18 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanMap.hpp 31 Aug 2004 18:29:18 -0000 1.2
+++ XalanMap.hpp 2 Sep 2004 21:53:34 -0000 1.3
@@ -101,7 +101,7 @@
typedef XALAN_STD_QUALIFIER pair<const key_type, data_type>
value_type;
typedef XalanMap<Key, Value, Hash, Comparator> ThisType;
-
+
typedef size_t size_type;
struct Entry : public value_type
@@ -113,7 +113,13 @@
value_type(key, data), bucketIndex(index)
{
}
-
+
+ Entry() :
+ value_type(key_type(),
+ data_type()),
+ bucketIndex(size_type())
+ {
+ }
};
typedef XALAN_STD_QUALIFIER list<Entry>
EntryListType;
@@ -350,9 +356,16 @@
{
m_size = 0;
- fill(m_buckets.begin(), m_buckets.end(), m_entries.end());
-
- m_freeList.splice(m_freeList.begin(), m_entries,
m_entries.begin(), m_entries.end());
+ XALAN_STD_QUALIFIER fill(
+ m_buckets.begin(),
+ m_buckets.end(),
+ m_entries.end());
+
+ m_freeList.splice(
+ m_freeList.begin(),
+ m_entries,
+ m_entries.begin(),
+ m_entries.end());
}
void swap(ThisType& theRhs)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]