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 2007/09/04 19:59:31 UTC
svn commit: r572759 [2/2] - in /xalan/c/trunk/src/xalanc: DOMSupport/
Include/ PlatformSupport/ Utils/MsgCreator/ XMLSupport/ XPath/ XSLT/
XalanDOM/ XalanSourceTree/ XercesParserLiaison/
Modified: xalan/c/trunk/src/xalanc/XPath/XObject.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObject.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObject.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObject.hpp Tue Sep 4 10:59:27 2007
@@ -143,7 +143,7 @@
virtual const XalanDOMString&
str() const;
- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);
+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);
/**
* Send the string value to a FormatterListener instance.
Modified: xalan/c/trunk/src/xalanc/XPath/XPath.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.hpp Tue Sep 4 10:59:27 2007
@@ -243,7 +243,7 @@
XPathExecutionContext& executionContext,
XalanDOMString& result) const;
- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);
+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);
/**
* Execute the XPath from the provided context.
Modified: xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.hpp Tue Sep 4 10:59:27 2007
@@ -125,20 +125,11 @@
{
}
- // Note non-const copy semantics...
- GetAndReleaseCachedString(GetAndReleaseCachedString& theSource) :
- m_constructionContext(theSource.m_constructionContext),
- m_string(theSource.m_string)
- {
- theSource.m_string = 0;
- }
-
~GetAndReleaseCachedString()
{
- if (m_string != 0)
- {
- m_constructionContext->releaseCachedString(*m_string);
- }
+ assert(m_string != 0);
+
+ m_constructionContext->releaseCachedString(*m_string);
}
XalanDOMString&
@@ -152,13 +143,18 @@
XPathConstructionContext&
getConstructionContext() const
{
+ assert(m_constructionContext != 0);
+
return *m_constructionContext;
}
-
private:
// Not implemented...
+ GetAndReleaseCachedString();
+
+ GetAndReleaseCachedString(const GetAndReleaseCachedString&);
+
GetAndReleaseCachedString&
operator=(const GetAndReleaseCachedString&);
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp Tue Sep 4 10:59:27 2007
@@ -37,9 +37,6 @@
-/**
- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a>
- */
// Base class header file...
#include <xalanc/PlatformSupport/ExecutionContext.hpp>
@@ -472,6 +469,10 @@
private:
// Not implemented...
+ GetAndReleaseCachedString();
+
+ GetAndReleaseCachedString(const GetAndReleaseCachedString&);
+
GetAndReleaseCachedString&
operator=(const GetAndReleaseCachedString&);
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp Tue Sep 4 10:59:27 2007
@@ -34,9 +34,6 @@
-/**
- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a>
- */
// Base class include file.
#include <xalanc/XPath/XPathExecutionContext.hpp>
@@ -348,7 +345,11 @@
protected:
- typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType;
+ typedef XalanObjectCache<
+ MutableNodeRefList,
+ DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>,
+ DeleteFunctor<MutableNodeRefList>,
+ ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType;
enum { eNodeListCacheListSize = 50 };
Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp Tue Sep 4 10:59:27 2007
@@ -214,16 +214,16 @@
m_expression->setCurrentPattern(m_constructionContext->getPooledString(pat));
- const int nChars = length(pat);
+ const t_size_type nChars = length(pat);
- int startSubstring = -1;
- int posOfNSSep = -1;
+ t_size_type startSubstring = XalanDOMString::npos;
+ t_size_type posOfNSSep = XalanDOMString::npos;
const XPathConstructionContext::GetAndReleaseCachedString theGuard(*m_constructionContext);
XalanDOMString& theToken = theGuard.get();
- for(int i = 0; i < nChars; i++)
+ for(t_size_type i = 0; i < nChars; i++)
{
XalanDOMChar c = charAt(pat, i);
@@ -231,9 +231,9 @@
{
case XalanUnicode::charQuoteMark:
{
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
- if(-1 != posOfNSSep)
+ if(XalanDOMString::npos != posOfNSSep)
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);
}
@@ -255,7 +255,7 @@
addToTokenQueue(theToken);
- startSubstring = -1;
+ startSubstring = XalanDOMString::npos;
}
else
{
@@ -266,9 +266,9 @@
case XalanUnicode::charApostrophe:
{
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
- if(-1 != posOfNSSep)
+ if(XalanDOMString::npos != posOfNSSep)
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);
}
@@ -290,7 +290,7 @@
addToTokenQueue(theToken);
- startSubstring = -1;
+ startSubstring = XalanDOMString::npos;
}
else
{
@@ -304,9 +304,9 @@
case XalanUnicode::charSpace:
case XalanUnicode::charHTab:
{
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
- if(-1 != posOfNSSep)
+ if(XalanDOMString::npos != posOfNSSep)
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);
}
@@ -317,14 +317,14 @@
addToTokenQueue(theToken);
}
- startSubstring = -1;
+ startSubstring = XalanDOMString::npos;
}
}
break;
case XalanUnicode::charHyphenMinus:
{
- if(!(startSubstring == -1))
+ if(!(startSubstring == XalanDOMString::npos))
{
break;
}
@@ -349,9 +349,9 @@
case XalanUnicode::charLessThanSign:
case XalanUnicode::charGreaterThanSign:
{
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
- if(-1 != posOfNSSep)
+ if(XalanDOMString::npos != posOfNSSep)
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i);
}
@@ -362,7 +362,7 @@
addToTokenQueue(theToken);
}
- startSubstring = -1;
+ startSubstring = XalanDOMString::npos;
}
substring(pat, theToken, i, i + 1);
@@ -375,7 +375,7 @@
{
if(posOfNSSep == i - 1 && i > 0)
{
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
if (startSubstring < i - 1)
{
@@ -385,8 +385,8 @@
}
}
- startSubstring = -1;
- posOfNSSep = -1;
+ startSubstring = XalanDOMString::npos;
+ posOfNSSep = XalanDOMString::npos;
substring(pat, theToken, i - 1, i + 1);
@@ -403,7 +403,7 @@
default:
{
- if(-1 == startSubstring)
+ if(XalanDOMString::npos == startSubstring)
{
startSubstring = i;
@@ -442,16 +442,16 @@
addToTokenQueue(theToken);
- startSubstring = -1;
+ startSubstring = XalanDOMString::npos;
}
}
}
}
}
- if(startSubstring != -1)
+ if(startSubstring != XalanDOMString::npos)
{
- if(-1 != posOfNSSep)
+ if(XalanDOMString::npos != posOfNSSep)
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars);
}
@@ -506,12 +506,12 @@
-int
+XPathProcessorImpl::t_size_type
XPathProcessorImpl::mapNSTokens(
const XalanDOMString& pat,
- int startSubstring,
- int posOfNSSep,
- int posOfScan)
+ t_size_type startSubstring,
+ t_size_type posOfNSSep,
+ t_size_type posOfScan)
{
assert(m_prefixResolver != 0);
@@ -577,7 +577,7 @@
}
}
- return -1;
+ return XalanDOMString::npos;
}
@@ -2940,14 +2940,16 @@
bool
XPathProcessorImpl::isCurrentLiteral() const
{
- const int last = length(m_token) - 1;
+ const t_size_type theLength = m_token.length();
- if (last <= 0)
+ if (theLength <= 1)
{
return false;
}
else
{
+ const t_size_type last = theLength - 1;
+
const XalanDOMChar c0 = m_tokenChar;
const XalanDOMChar cX = charAt(m_token, last);
Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp Tue Sep 4 10:59:27 2007
@@ -72,6 +72,8 @@
typedef XalanVector<bool> BoolVectorType;
+ typedef XalanDOMString::size_type t_size_type;
+
XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
@@ -123,12 +125,12 @@
* When a separator token is found, see if there's a element name or the
* like to map.
*/
- int
+ t_size_type
mapNSTokens(
const XalanDOMString& pat,
- int startSubstring,
- int posOfNSSep,
- int posOfScan);
+ t_size_type startSubstring,
+ t_size_type posOfNSSep,
+ t_size_type posOfScan);
/**
* Check if m_token==s. If m_token is null, this won't throw
Modified: xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp Tue Sep 4 10:59:27 2007
@@ -52,7 +52,7 @@
*/
struct Counter
{
- typedef unsigned long CountType;
+ typedef XalanSize_t CountType;
typedef XalanVector<XalanNode*> NodeVectorType;
Modified: xalan/c/trunk/src/xalanc/XSLT/DecimalToRoman.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/DecimalToRoman.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/DecimalToRoman.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/DecimalToRoman.hpp Tue Sep 4 10:59:27 2007
@@ -40,7 +40,7 @@
{
enum { eMaxLetter = 2 };
- typedef unsigned long ValueType;
+ typedef XalanSize_t ValueType;
ValueType m_postValue;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp Tue Sep 4 10:59:27 2007
@@ -96,6 +96,7 @@
}
+
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
const ElemTemplateElement*
ElemCopy::startElement(StylesheetExecutionContext& executionContext) const
@@ -122,7 +123,6 @@
executionContext.copyNamespaceAttributes(*sourceNode);
return beginExecuteChildren(executionContext);
-
}
else
{
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp Tue Sep 4 10:59:27 2007
@@ -187,7 +187,7 @@
void
characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
m_executionContext.characters(chars, 0, length);
}
@@ -195,7 +195,7 @@
void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
m_executionContext.charactersRaw(chars, 0, length);
}
@@ -208,7 +208,7 @@
void
ignorableWhitespace(
const XMLCh* const /* chars */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
@@ -234,7 +234,7 @@
void
cdata(
const XMLCh* const /* ch */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Tue Sep 4 10:59:27 2007
@@ -58,6 +58,7 @@
#include <xalanc/PlatformSupport/AttributeListImpl.hpp>
+#include <xalanc/PlatformSupport/FormatterListener.hpp>
#include <xalanc/PlatformSupport/XalanCollationServices.hpp>
@@ -107,11 +108,9 @@
{
public:
-#if defined(XALAN_STRICT_ANSI_HEADERS)
- typedef std::size_t tl_size_type;
-#else
- typedef size_t tl_size_type;
-#endif
+ typedef XalanSize_t tl_size_type;
+
+ typedef FormatterListener::size_type fl_size_type;
#if defined(XALAN_NO_STD_NAMESPACE)
typedef ostream StreamType;
@@ -1071,9 +1070,9 @@
*/
virtual void
characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length) = 0;
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length) = 0;
/**
* Receive notification of character data. If available, when the
@@ -1086,9 +1085,9 @@
*/
virtual void
charactersRaw(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length) = 0;
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length) = 0;
/**
* Called when a Comment is to be constructed.
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Tue Sep 4 10:59:27 2007
@@ -926,9 +926,9 @@
void
StylesheetExecutionContextDefault::characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length)
{
assert(m_xsltProcessor != 0);
@@ -939,9 +939,9 @@
void
StylesheetExecutionContextDefault::charactersRaw(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length)
{
assert(m_xsltProcessor != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp Tue Sep 4 10:59:27 2007
@@ -473,15 +473,15 @@
virtual void
characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length);
virtual void
charactersRaw(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ fl_size_type start,
+ fl_size_type length);
virtual void
comment(const XalanDOMChar* data);
@@ -517,8 +517,7 @@
endCreateXResultTreeFrag();
virtual void
- beginFormatToText(
- XalanDOMString& theResult);
+ beginFormatToText(XalanDOMString& theResult);
virtual void
endFormatToText();
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Tue Sep 4 10:59:27 2007
@@ -1527,7 +1527,7 @@
void
StylesheetHandler::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if (m_inTemplate == false &&
inExtensionElement() == false &&
@@ -1553,7 +1553,7 @@
void
StylesheetHandler::cdata(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
accumulateText(chars, length);
@@ -1567,7 +1567,7 @@
void
StylesheetHandler::ignorableWhitespace(
const XMLCh* const /*chars*/,
- const unsigned int /*length*/)
+ const size_type /*length*/)
{
// Ignore!
m_lastPopped = 0;
@@ -1619,7 +1619,7 @@
void
StylesheetHandler::charactersRaw(
const XMLCh* const /* chars */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
@@ -1627,8 +1627,8 @@
void
StylesheetHandler::processText(
- const XMLCh* chars,
- XalanDOMString::size_type length)
+ const XMLCh* chars,
+ size_type length)
{
if(m_inTemplate)
{
@@ -1721,8 +1721,8 @@
void
StylesheetHandler::accumulateText(
- const XMLCh* chars,
- XalanDOMString::size_type length)
+ const XMLCh* chars,
+ size_type length)
{
if(m_inTemplate)
{
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp Tue Sep 4 10:59:27 2007
@@ -131,7 +131,10 @@
* @see #ignorableWhitespace
* @see org.xml.sax.Locator
*/
- virtual void characters (const XMLCh* const chars, const unsigned int length);
+ virtual void
+ characters(
+ const XMLCh* const chars,
+ const size_type length);
/**
* Receive notification of character data. If available, when the
@@ -143,7 +146,10 @@
* @param length number of characters to read from the array
* @exception SAXException
*/
- virtual void charactersRaw(const XMLCh* const chars, const unsigned int length);
+ virtual void
+ charactersRaw(
+ const XMLCh* const chars,
+ const size_type length);
/**
* Receive notification of cdata.
@@ -168,7 +174,10 @@
* @exception SAXException
* @see #ignorableWhitespace
*/
- virtual void cdata(const XMLCh* const ch, const unsigned int length);
+ virtual void
+ cdata(
+ const XMLCh* const ch,
+ const size_type length);
/**
* Receive notification of ignorable whitespace in element content.
@@ -193,7 +202,10 @@
* @exception SAXException
* @see #characters
*/
- virtual void ignorableWhitespace (const XMLCh* const chars, const unsigned int length);
+ virtual void
+ ignorableWhitespace(
+ const XMLCh* const chars,
+ const size_type length);
/**
* Receive notification of a processing instruction.
@@ -469,13 +481,13 @@
void
processText(
- const XMLCh* chars,
- XalanDOMString::size_type length);
+ const XMLCh* chars,
+ size_type length);
void
accumulateText(
- const XMLCh* chars,
- XalanDOMString::size_type length);
+ const XMLCh* chars,
+ size_type length);
void
processAccumulatedText();
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Tue Sep 4 10:59:27 2007
@@ -695,7 +695,7 @@
#if defined(XALAN_OLD_STYLE_CASTS)
nsNode = (const XalanElement*)&fragBase;
#else
- nsNode = static_cast<XalanElement*>(node);
+ nsNode = static_cast<const XalanElement*>(node);
#endif
}
else
@@ -1376,12 +1376,12 @@
void
XSLTEngineImpl::addResultAttribute(
- AttributeListImpl& attList,
- const XalanDOMString& aname,
- const XalanDOMChar* value,
- XalanDOMString::size_type theLength,
- bool fromCopy,
- const LocatorType* locator)
+ AttributeListImpl& attList,
+ const XalanDOMString& aname,
+ const XalanDOMChar* value,
+ size_type theLength,
+ bool fromCopy,
+ const LocatorType* locator)
{
assert(value != 0);
@@ -1720,8 +1720,8 @@
void
XSLTEngineImpl::characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ size_type length)
{
characters(
ch,
@@ -1733,9 +1733,9 @@
void
XSLTEngineImpl::characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length)
{
assert(getFormatterListenerImpl() != 0);
assert(ch != 0);
@@ -1829,9 +1829,9 @@
void
XSLTEngineImpl::charactersRaw(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length)
{
assert(ch != 0);
assert(length != 0);
@@ -1892,8 +1892,8 @@
void
XSLTEngineImpl::ignorableWhitespace(
- const XalanDOMChar* ch,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ size_type length)
{
assert(getFormatterListenerImpl() != 0);
assert(ch != 0);
@@ -1985,9 +1985,9 @@
void
XSLTEngineImpl::cdata(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length)
{
assert(getFormatterListenerImpl() != 0);
assert(ch != 0);
@@ -3192,10 +3192,10 @@
void
XSLTEngineImpl::fireCharacterGenerateEvent(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length,
- bool isCDATA)
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length,
+ bool isCDATA)
{
const GenerateEvent ge(
isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA : GenerateEvent::EVENTTYPE_CHARACTERS,
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp Tue Sep 4 10:59:27 2007
@@ -431,9 +431,9 @@
*/
void
addResultNamespaceDecl(
- const XalanDOMString& prefix,
- const XalanDOMChar* namespaceVal,
- XalanDOMString::size_type len)
+ const XalanDOMString& prefix,
+ const XalanDOMChar* namespaceVal,
+ size_type len)
{
m_resultNamespacesStack.addDeclaration(
prefix,
@@ -507,12 +507,12 @@
*/
void
addResultAttribute(
- AttributeListImpl& attList,
- const XalanDOMString& aname,
- const XalanDOMChar* value,
- XalanDOMString::size_type theLength,
- bool fromCopy = false,
- const LocatorType* locator = 0);
+ AttributeListImpl& attList,
+ const XalanDOMString& aname,
+ const XalanDOMChar* value,
+ size_type theLength,
+ bool fromCopy = false,
+ const LocatorType* locator = 0);
/**
* Add attribute to pending attributes list, and if it is a namespace, add
@@ -595,13 +595,13 @@
void
characters (
- const XalanDOMChar* ch,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ size_type length);
void
ignorableWhitespace(
- const XalanDOMChar* ch,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ size_type length);
void
processingInstruction(
@@ -620,9 +620,9 @@
*/
void
characters(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length);
/**
* Send character data from the node to the result tree.
@@ -660,9 +660,9 @@
*/
void
charactersRaw(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length);
/**
* Send raw character data from the node to the result tree.
@@ -706,9 +706,9 @@
*/
void
cdata(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length);
/**
* Clone a node to the result tree
@@ -1610,10 +1610,10 @@
void
fireCharacterGenerateEvent(
- const XalanDOMChar* ch,
- XalanDOMString::size_type start,
- XalanDOMString::size_type length,
- bool isCDATA);
+ const XalanDOMChar* ch,
+ size_type start,
+ size_type length,
+ bool isCDATA);
void
checkDefaultNamespace(
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessor.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessor.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessor.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessor.hpp Tue Sep 4 10:59:27 2007
@@ -82,7 +82,7 @@
{
public:
- typedef size_t size_type;
+ typedef XalanSize_t size_type;
XSLTProcessor();
Modified: xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp Tue Sep 4 10:59:27 2007
@@ -45,6 +45,7 @@
class XALAN_DOM_EXPORT XalanDOMString
{
public:
+
typedef XalanVector<XalanDOMChar> XalanDOMCharVectorType;
typedef XalanVector<char> CharVectorType;
typedef XalanVector<wchar_t> WideCharVectorType;
@@ -53,7 +54,7 @@
typedef XalanDOMChar& reference;
typedef const XalanDOMChar& const_reference;
- typedef unsigned int size_type;
+ typedef XalanSize_t size_type;
typedef XalanDOMCharVectorType::iterator iterator;
typedef XalanDOMCharVectorType::const_iterator const_iterator;
@@ -63,7 +64,7 @@
#if defined(XALAN_INLINE_INITIALIZATION)
static const size_type npos = ~0u;
#else
- enum { npos = -1 };
+ enum { npos = ~0u };
#endif
XalanDOMString(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRUCTOR_MEMMGR);
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp Tue Sep 4 10:59:27 2007
@@ -261,7 +261,7 @@
void
FormatterToSourceTree::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if (m_documentFragment != 0)
{
@@ -285,7 +285,7 @@
void
FormatterToSourceTree::charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_document != 0);
@@ -308,7 +308,7 @@
void
FormatterToSourceTree::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_document != 0);
@@ -383,7 +383,7 @@
void
FormatterToSourceTree::cdata(
const XMLCh* const /* ch */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
@@ -404,8 +404,8 @@
void
FormatterToSourceTree::doCharacters(
- const XMLCh* chars,
- XalanDOMString::size_type length)
+ const XMLCh* chars,
+ size_type length)
{
if (m_currentElement != 0)
{
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp Tue Sep 4 10:59:27 2007
@@ -144,7 +144,7 @@
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
comment(const XMLCh* const data);
@@ -152,7 +152,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -177,12 +177,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -206,8 +206,8 @@
void
doCharacters(
- const XalanDOMChar* chars,
- XalanDOMString::size_type length);
+ const XalanDOMChar* chars,
+ size_type length);
void
doProcessingInstruction(
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp Tue Sep 4 10:59:27 2007
@@ -67,7 +67,7 @@
void
XalanSourceTreeContentHandler::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_inDTD == false);
@@ -196,7 +196,7 @@
void
XalanSourceTreeContentHandler::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_inDTD == false);
@@ -372,7 +372,7 @@
void
XalanSourceTreeContentHandler::comment(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_document != 0);
@@ -501,8 +501,8 @@
void
XalanSourceTreeContentHandler::doCharacters(
- const XMLCh* chars,
- XalanDOMString::size_type length)
+ const XMLCh* chars,
+ size_type length)
{
assert(m_inDTD == false);
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp Tue Sep 4 10:59:27 2007
@@ -76,7 +76,8 @@
public:
typedef XalanVector<XalanSourceTreeElement*> ElementStackType;
- typedef XalanVector<XalanNode*> LastChildStackType;
+ typedef XalanVector<XalanNode*> LastChildStackType;
+ typedef XalanSize_t size_type;
enum { eDefaultStackSize = 50, eDefaultTextBufferSize = 100 };
@@ -96,7 +97,7 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
endDocument();
@@ -110,7 +111,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -167,7 +168,7 @@
virtual void
comment(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
endCDATA();
@@ -227,8 +228,8 @@
void
doCharacters(
- const XMLCh* chars,
- XalanDOMString::size_type length);
+ const XMLCh* chars,
+ size_type length);
// Data members...
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp Tue Sep 4 10:59:27 2007
@@ -193,7 +193,7 @@
void
FormatterToXercesDOM::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
m_textBuffer.append(chars, length);
}
@@ -203,7 +203,7 @@
void
FormatterToXercesDOM::charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
try
{
@@ -239,7 +239,7 @@
void
FormatterToXercesDOM::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
try
{
@@ -303,7 +303,7 @@
void
FormatterToXercesDOM::cdata(
const XMLCh* const ch,
- const unsigned int length)
+ const size_type length)
{
try
{
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp Tue Sep 4 10:59:27 2007
@@ -84,12 +84,12 @@
~FormatterToXercesDOM();
- // These methods are inherited from DocumentHandler ...
+ // These methods are inherited from FormatterListener...
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
comment(const XMLCh* const data);
@@ -97,7 +97,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -122,12 +122,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org