amassari 2004/03/03 02:35:08
Modified: c/src/xercesc/dom/impl DOMDeepNodeListPool.c
DOMDeepNodeListPool.hpp
Log:
[bug# 7051] The "hash" argument clashes with STL hash
Revision Changes Path
1.10 +3 -3 xml-xerces/c/src/xercesc/dom/impl/DOMDeepNodeListPool.c
Index: DOMDeepNodeListPool.c
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDeepNodeListPool.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMDeepNodeListPool.c 17 Dec 2003 00:18:33 -0000 1.9
+++ DOMDeepNodeListPool.c 3 Mar 2004 10:35:08 -0000 1.10
@@ -110,7 +110,7 @@
template <class TVal>
DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const XMLSize_t modulus
, const bool adoptElems
- , HashBase* hash
+ , HashBase* hashBase
, const XMLSize_t initSize) :
fAdoptedElems(adoptElems)
, fBucketList(0)
@@ -123,7 +123,7 @@
{
initialize(modulus);
// set hasher
- fHash = hash;
+ fHash = hashBase;
//
// Allocate the initial id pointers array. We don't have to zero them
1.8 +2 -2 xml-xerces/c/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
Index: DOMDeepNodeListPool.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMDeepNodeListPool.hpp 29 Jan 2004 11:44:26 -0000 1.7
+++ DOMDeepNodeListPool.hpp 3 Mar 2004 10:35:08 -0000 1.8
@@ -157,7 +157,7 @@
(
const XMLSize_t modulus
, const bool adoptElems
- , HashBase* hash
+ , HashBase* hashBase
, const XMLSize_t initSize = 128
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
