You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/05/10 21:15:40 UTC

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

dbertoni    01/05/10 12:15:40

  Modified:    c/src/PlatformSupport XalanDOMStringHashTable.cpp
  Log:
  Changed hash to hashString since Solaris seems to have a conflicting hash() function.  The evils of global functions...
  
  Revision  Changes    Path
  1.2       +4 -4      xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.cpp
  
  Index: XalanDOMStringHashTable.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XalanDOMStringHashTable.cpp	2001/05/10 17:47:06	1.1
  +++ XalanDOMStringHashTable.cpp	2001/05/10 19:15:37	1.2
  @@ -153,7 +153,7 @@
   
   
   inline unsigned int
  -hash(
  +hashString(
   			const XalanDOMChar*		theString,
   			unsigned int			theLength)
   {
  @@ -186,7 +186,7 @@
   	const unsigned int	theActualLength =
   		theLength == unsigned(-1) ? length(theString) : theLength;
   
  -	const unsigned int	theHash = hash(theString, theActualLength);
  +	const unsigned int	theHash = hashString(theString, theActualLength);
   
   	const unsigned int	theLocalBucketIndex = theHash % m_bucketCount;
   
  @@ -224,7 +224,7 @@
   void
   XalanDOMStringHashTable::insert(const XalanDOMString&	theString)
   {
  -	const unsigned int	theHash = hash(c_wstr(theString), length(theString));
  +	const unsigned int	theHash = hashString(c_wstr(theString), length(theString));
   
   	const unsigned int	theBucketIndex = theHash % m_bucketCount;
   
  @@ -253,7 +253,7 @@
   			const XalanDOMString&	theString,
   			unsigned int			theBucketIndex)
   {
  -	assert(theBucketIndex == hash(c_wstr(theString), length(theString)) % m_bucketCount);
  +	assert(theBucketIndex == hashString(c_wstr(theString), length(theString)) % m_bucketCount);
   	assert(theBucketIndex < m_bucketCount);
   
   	BucketType&	theBucket = m_buckets[theBucketIndex];
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org