xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/XalanSourceTree FormatterToSourceTree.cpp FormatterToSourceTree.hpp XalanSourceTreeComment.cpp XalanSourceTreeContentHandler.cpp XalanSourceTreeDocument.cpp XalanSourceTreeDocument.hpp XalanSourceTreeText.cpp
Date Tue, 25 Sep 2001 21:13:05 GMT
dbertoni    01/09/25 14:13:05

  Modified:    c/src/XalanSourceTree FormatterToSourceTree.cpp
                        FormatterToSourceTree.hpp
                        XalanSourceTreeComment.cpp
                        XalanSourceTreeContentHandler.cpp
                        XalanSourceTreeDocument.cpp
                        XalanSourceTreeDocument.hpp XalanSourceTreeText.cpp
  Log:
  32/64-bit fixes.
  
  Revision  Changes    Path
  1.7       +2 -2      xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp
  
  Index: FormatterToSourceTree.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FormatterToSourceTree.cpp	2001/06/29 18:44:24	1.6
  +++ FormatterToSourceTree.cpp	2001/09/25 21:13:04	1.7
  @@ -352,8 +352,8 @@
   
   void
   FormatterToSourceTree::doCharacters(
  -			const XMLCh*	chars,
  -			unsigned int	length)
  +			const XMLCh*				chars,
  +			XalanDOMString::size_type	length)
   {
   	if (m_currentElement != 0)
   	{
  
  
  
  1.8       +2 -2      xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp
  
  Index: FormatterToSourceTree.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FormatterToSourceTree.hpp	2001/06/29 18:44:25	1.7
  +++ FormatterToSourceTree.hpp	2001/09/25 21:13:04	1.8
  @@ -235,8 +235,8 @@
   
   	void
   	doCharacters(
  -			const XalanDOMChar*		chars,
  -			unsigned int			length);
  +			const XalanDOMChar*			chars,
  +			XalanDOMString::size_type	length);
   
   	void
   	doProcessingInstruction(
  
  
  
  1.5       +3 -1      xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.cpp
  
  Index: XalanSourceTreeComment.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeComment.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanSourceTreeComment.cpp	2001/01/18 22:34:29	1.4
  +++ XalanSourceTreeComment.cpp	2001/09/25 21:13:04	1.5
  @@ -372,7 +372,9 @@
   unsigned int
   XalanSourceTreeComment::getLength() const
   {
  -	return length(m_data);
  +	assert(unsigned(length(m_data)) == length(m_data));
  +
  +	return unsigned(length(m_data));
   }
   
   
  
  
  
  1.9       +2 -0      xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp
  
  Index: XalanSourceTreeContentHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XalanSourceTreeContentHandler.cpp	2001/08/13 17:14:45	1.8
  +++ XalanSourceTreeContentHandler.cpp	2001/09/25 21:13:04	1.9
  @@ -518,6 +518,8 @@
   
   	if (isEmpty(m_textBuffer) == false)
   	{
  +		assert(unsigned(length(m_textBuffer)) == length(m_textBuffer));
  +
   		doCharacters(c_wstr(m_textBuffer), length(m_textBuffer));
   
   		clear(m_textBuffer);
  
  
  
  1.20      +22 -22    xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp
  
  Index: XalanSourceTreeDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XalanSourceTreeDocument.cpp	2001/08/06 01:37:01	1.19
  +++ XalanSourceTreeDocument.cpp	2001/09/25 21:13:04	1.20
  @@ -81,14 +81,14 @@
   
   
   XalanSourceTreeDocument::XalanSourceTreeDocument(
  -			unsigned long	theNumber,
  -			bool			fPoolAllText,
  -			unsigned int	theNamesStringPoolBlockSize,
  -			unsigned int	theNamesStringPoolBucketCount,
  -			unsigned int	theNamesStringPoolBucketSize,
  -			unsigned int	theValuesStringPoolBlockSize,
  -			unsigned int	theValuesStringPoolBucketCount,
  -			unsigned int	theValuesStringPoolBucketSize) :
  +			unsigned long		theNumber,
  +			bool				fPoolAllText,
  +			block_size_type		theNamesStringPoolBlockSize,
  +			bucket_count_type	theNamesStringPoolBucketCount,
  +			bucket_size_type	theNamesStringPoolBucketSize,
  +			block_size_type		theValuesStringPoolBlockSize,
  +			bucket_count_type	theValuesStringPoolBucketCount,
  +			bucket_size_type	theValuesStringPoolBucketSize) :
   	XalanDocument(),
   	m_number(theNumber),
   	m_firstChild(0),
  @@ -659,10 +659,10 @@
   
   inline const XalanDOMString&
   getElementNodePrefix(
  -			const XalanDOMChar*		qname,
  -			XalanDOMStringPool*		theStringPool,
  -			unsigned int			theLength,			
  -			unsigned int			theColonIndex)
  +			const XalanDOMChar*			qname,
  +			XalanDOMStringPool*			theStringPool,
  +			XalanDOMString::size_type	theLength,			
  +			XalanDOMString::size_type	theColonIndex)
   {
   	if(theColonIndex == theLength)
   	{
  @@ -698,8 +698,8 @@
   	XalanSourceTreeAttr** const		theAttributeVector =
   		theAttributeCount == 0 ? 0 : m_attributesVector.allocate(theAttributeCount);
   
  -	const unsigned int	theColonIndex = indexOf(qname, XalanUnicode::charColon);
  -	const unsigned int	theLength = length(qname);
  +	const XalanDOMString::size_type		theColonIndex = indexOf(qname, XalanUnicode::charColon);
  +	const XalanDOMString::size_type		theLength = length(qname);
   
   	XalanSourceTreeElement* const	theNewElement =
   		m_elementNSAllocator.create(
  @@ -769,7 +769,7 @@
   XalanSourceTreeComment*
   XalanSourceTreeDocument::createCommentNode(
   			const XalanDOMChar*			data,
  -			unsigned int				length,
  +			XalanDOMString::size_type	length,
   			XalanSourceTreeElement*		theParentElement,
   			XalanNode*					thePreviousSibling,
   			XalanNode*					theNextSibling)
  @@ -810,8 +810,8 @@
   
   inline const XalanDOMString&
   XalanSourceTreeDocument::getTextNodeString(
  -			const XalanDOMChar*		chars,
  -			unsigned int			length)
  +			const XalanDOMChar*			chars,
  +			XalanDOMString::size_type	length)
   {
   	if (m_poolAllText == true)
   	{
  @@ -841,8 +841,8 @@
   			XalanDOMString&			thePrefix,
   			bool					fUseDefault)
   {
  -	const unsigned int	theLength = length(theName);
  -	const unsigned int	theColonIndex = indexOf(theName, XalanUnicode::charColon);
  +	const XalanDOMString::size_type		theLength = length(theName);
  +	const XalanDOMString::size_type		theColonIndex = indexOf(theName, XalanUnicode::charColon);
   
   	if (theColonIndex != theLength)
   	{
  @@ -1047,9 +1047,9 @@
   		// the local name is the same as the tag name.  Otherwise, we need
   		// to remove the prefix and the ':' that separates them.  If
   		// m_stringBuffer is of length 0, there's no prefix.
  -		const unsigned int			thePrefixLength = length(m_stringBuffer);
  +		const XalanDOMString::size_type		thePrefixLength = length(m_stringBuffer);
   
  -		const XalanDOMChar* const	theLocalName =
  +		const XalanDOMChar* const			theLocalName =
   			thePrefixLength == 0 ? theTagName : theTagName + thePrefixLength + 1;
   
   		// The constructor parameters for ElementNS are:
  @@ -1119,7 +1119,7 @@
   				theAttributes.getLocalName(i);
   			assert(theLocalName != 0);
   
  -			const unsigned int	theColonIndex = indexOf(theQName, XalanUnicode::charColon);
  +			const XalanDOMString::size_type		theColonIndex = indexOf(theQName, XalanUnicode::charColon);
   			assert(theColonIndex != length(theQName));
   
   			// The constructor parameters for AttrNS are:
  
  
  
  1.12      +17 -13    xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp
  
  Index: XalanSourceTreeDocument.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XalanSourceTreeDocument.hpp	2001/08/06 01:37:01	1.11
  +++ XalanSourceTreeDocument.hpp	2001/09/25 21:13:05	1.12
  @@ -150,6 +150,10 @@
   		   eDefaultValuesStringPoolBucketSize = XalanDOMStringPool::eDefaultBucketSize };
   
   
  +	typedef XalanDOMStringPool::block_size_type		block_size_type;
  +	typedef XalanDOMStringPool::bucket_count_type	bucket_count_type;
  +	typedef XalanDOMStringPool::bucket_size_type	bucket_size_type;
  +
   	/**
   	 *
   	 * Constructor for XalanSourceTreeDocument.
  @@ -165,14 +169,14 @@
   	 *
   	 */
   	XalanSourceTreeDocument(
  -			unsigned long	theNumber,
  -			bool			fPoolAllText = true,
  -			unsigned int	theNamesStringPoolBlockSize = eDefaultNamesStringPoolBlockSize,
  -			unsigned int	theNamesStringPoolBucketCount = eDefaultNamesStringPoolBucketCount,
  -			unsigned int	theNamesStringPoolBucketSize = eDefaultNamesStringPoolBucketSize,
  -			unsigned int	theValuesStringPoolBlockSize = eDefaultValuesStringPoolBlockSize,
  -			unsigned int	theValuesStringPoolBucketCount = eDefaultValuesStringPoolBucketCount,
  -			unsigned int	theValuesStringPoolBucketSize = eDefaultValuesStringPoolBucketSize);
  +			unsigned long		theNumber,
  +			bool				fPoolAllText = true,
  +			block_size_type		theNamesStringPoolBlockSize = eDefaultNamesStringPoolBlockSize,
  +			bucket_count_type	theNamesStringPoolBucketCount = eDefaultNamesStringPoolBucketCount,
  +			bucket_size_type	theNamesStringPoolBucketSize = eDefaultNamesStringPoolBucketSize,
  +			block_size_type		theValuesStringPoolBlockSize = eDefaultValuesStringPoolBlockSize,
  +			bucket_count_type	theValuesStringPoolBucketCount = eDefaultValuesStringPoolBucketCount,
  +			bucket_size_type	theValuesStringPoolBucketSize = eDefaultValuesStringPoolBucketSize);
   
   	virtual
   	~XalanSourceTreeDocument();
  @@ -372,7 +376,7 @@
   	XalanSourceTreeComment*
   	createCommentNode(
   			const XalanDOMChar*			data,
  -			unsigned int				length,
  +			XalanDOMString::size_type	length,
   			XalanSourceTreeElement*		theParentElement = 0,
   			XalanNode*					thePreviousSibling = 0,
   			XalanNode*					theNextSibling = 0);
  @@ -388,7 +392,7 @@
   	XalanSourceTreeText*
   	createTextNode(
   			const XalanDOMChar*			chars,
  -			unsigned int				length,
  +			XalanDOMString::size_type	length,
   			XalanSourceTreeElement*		theParentElement = 0,
   			XalanNode*					thePreviousSibling = 0,
   			XalanNode*					theNextSibling = 0);
  @@ -396,7 +400,7 @@
   	XalanSourceTreeText*
   	createTextIWSNode(
   			const XalanDOMChar*			chars,
  -			unsigned int				length,
  +			XalanDOMString::size_type	length,
   			XalanSourceTreeElement*		theParentElement = 0,
   			XalanNode*					thePreviousSibling = 0,
   			XalanNode*					theNextSibling = 0);
  @@ -465,8 +469,8 @@
   
   	const XalanDOMString&
   	getTextNodeString(
  -			const XalanDOMChar*		chars,
  -			unsigned int			length);
  +			const XalanDOMChar*			chars,
  +			XalanDOMString::size_type	length);
   
   	const XalanDOMString*
   	getNamespaceForPrefix(
  
  
  
  1.7       +3 -1      xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.cpp
  
  Index: XalanSourceTreeText.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeText.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanSourceTreeText.cpp	2001/02/09 19:42:10	1.6
  +++ XalanSourceTreeText.cpp	2001/09/25 21:13:05	1.7
  @@ -360,7 +360,9 @@
   unsigned int
   XalanSourceTreeText::getLength() const
   {
  -	return length(m_data);
  +	assert(unsigned(length(m_data)) == length(m_data));
  +
  +	return unsigned(length(m_data));
   }
   
   
  
  
  

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


Mime
View raw message