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 2008/10/21 18:34:07 UTC
svn commit: r706680 [1/3] - in /xalan/c/trunk: samples/ExternalFunction/
src/xalanc/ICUBridge/ src/xalanc/XMLSupport/ src/xalanc/XPath/
src/xalanc/XSLT/ src/xalanc/XalanEXSLT/ src/xalanc/XalanExtensions/
src/xalanc/XalanSourceTree/ src/xalanc/XercesPar...
Author: dbertoni
Date: Tue Oct 21 09:34:02 2008
New Revision: 706680
URL: http://svn.apache.org/viewvc?rev=706680&view=rev
Log:
Removed use of LocatorType typedef.
Modified:
xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp
xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp
xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp
xalan/c/trunk/src/xalanc/XPath/Function.cpp
xalan/c/trunk/src/xalanc/XPath/Function.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp
xalan/c/trunk/src/xalanc/XPath/XPath.cpp
xalan/c/trunk/src/xalanc/XPath/XPath.hpp
xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp
xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
xalan/c/trunk/src/xalanc/XPath/XPathProcessor.hpp
xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.cpp
xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.hpp
xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/AVT.cpp
xalan/c/trunk/src/xalanc/XSLT/AVT.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionKey.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp
xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.hpp
xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.cpp
xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamic.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSet.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp
xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
Modified: xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp (original)
+++ xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp Tue Oct 21 09:34:02 2008
@@ -45,6 +45,7 @@
XALAN_USING_XALAN(Function)
+XALAN_USING_XALAN(Locator)
XALAN_USING_XALAN(XPathExecutionContext)
XALAN_USING_XALAN(XalanDOMString)
XALAN_USING_XALAN(XalanNode)
@@ -75,7 +76,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -162,7 +163,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -249,7 +250,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.empty() == false)
{
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp Tue Oct 21 09:34:02 2008
@@ -95,7 +95,7 @@
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (!doFormat(theNumber, thePattern, theResult, theDFS))
{
Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp Tue Oct 21 09:34:02 2008
@@ -176,7 +176,7 @@
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0) const;
+ const Locator* locator = 0) const;
class UnlocalizePatternFunctor
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp Tue Oct 21 09:34:02 2008
@@ -38,7 +38,7 @@
void
-FormatterToNull::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToNull::setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp Tue Oct 21 09:34:02 2008
@@ -57,7 +57,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Tue Oct 21 09:34:02 2008
@@ -142,7 +142,7 @@
void
-FormatterToText::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToText::setDocumentLocator(const Locator* const /* locator */)
{
// No action for the moment.
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp Tue Oct 21 09:34:02 2008
@@ -170,7 +170,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Tue Oct 21 09:34:02 2008
@@ -1038,7 +1038,7 @@
void
-FormatterToXML::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToXML::setDocumentLocator(const Locator* const /* locator */)
{
// I don't do anything with this yet.
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp Tue Oct 21 09:34:02 2008
@@ -129,7 +129,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp Tue Oct 21 09:34:02 2008
@@ -230,7 +230,7 @@
void
-XalanXMLSerializerBase::setDocumentLocator(const LocatorType* const /* locator */)
+XalanXMLSerializerBase::setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp Tue Oct 21 09:34:02 2008
@@ -39,7 +39,7 @@
void
-FormatterStringLengthCounter::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterStringLengthCounter::setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp Tue Oct 21 09:34:02 2008
@@ -62,7 +62,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XPath/Function.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/Function.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/Function.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/Function.cpp Tue Oct 21 09:34:02 2008
@@ -46,7 +46,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
const XObjectArgVectorType::size_type theArgCount = args.size();
@@ -83,7 +83,7 @@
Function::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
generalError(
executionContext,
@@ -100,7 +100,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr /* arg1 */,
- const LocatorType* locator) const
+ const Locator* locator) const
{
generalError(
executionContext,
@@ -118,7 +118,7 @@
XalanNode* context,
const XObjectPtr /* arg1 */,
const XObjectPtr /* arg2 */,
- const LocatorType* locator) const
+ const Locator* locator) const
{
generalError(
executionContext,
@@ -137,7 +137,7 @@
const XObjectPtr /* arg1 */,
const XObjectPtr /* arg2 */,
const XObjectPtr /* arg3 */,
- const LocatorType* locator) const
+ const Locator* locator) const
{
generalError(
executionContext,
Modified: xalan/c/trunk/src/xalanc/XPath/Function.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/Function.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/Function.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/Function.hpp Tue Oct 21 09:34:02 2008
@@ -78,7 +78,7 @@
* @param executionContext executing context
* @param context current context node
* @param args vector of pointers to XObject arguments
- * @param locator LocatorType instance for the XPath expression that contains the function call
+ * @param locator Locator instance for the XPath expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -86,7 +86,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -94,14 +94,14 @@
*
* @param executionContext executing context
* @param context current context node
- * @param locator LocatorType instance for the XPath expression that contains the function call
+ * @param locator Locator instance for the XPath expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const;
+ const Locator* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -110,7 +110,7 @@
* @param executionContext executing context
* @param context current context node
* @param arg pointer to XObject argument
- * @param locator LocatorType instance for the XPath expression that contains the function call
+ * @param locator Locator instance for the XPath expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -118,7 +118,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const LocatorType* locator) const;
+ const Locator* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -128,7 +128,7 @@
* @param context current context node
* @param arg1 pointer to XObject argument
* @param arg2 pointer to XObject argument
- * @param locator LocatorType instance for the XPath expression that contains the function call
+ * @param locator Locator instance for the XPath expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -137,7 +137,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -158,7 +158,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const;
+ const Locator* locator) const;
/**
* Create a copy of the function object.
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionConcat.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -72,7 +72,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() == false);
@@ -94,7 +94,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectArgVectorType& args,
- const LocatorType* /* locator */) const
+ const Locator* /* locator */) const
{
const XObjectArgVectorType::const_iterator theEnd = args.end();
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp Tue Oct 21 09:34:02 2008
@@ -55,7 +55,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
XObjectPtr
execute(
@@ -63,7 +63,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
XObjectPtr
execute(
@@ -72,7 +72,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionContains.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp Tue Oct 21 09:34:02 2008
@@ -56,7 +56,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp Tue Oct 21 09:34:02 2008
@@ -52,7 +52,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false);
assert(context != 0);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp Tue Oct 21 09:34:02 2008
@@ -72,7 +72,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp Tue Oct 21 09:34:02 2008
@@ -64,7 +64,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp Tue Oct 21 09:34:02 2008
@@ -68,7 +68,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.cpp Tue Oct 21 09:34:02 2008
@@ -56,7 +56,7 @@
FunctionNamespaceURI::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (context == 0)
{
@@ -90,7 +90,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp Tue Oct 21 09:34:02 2008
@@ -64,14 +64,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const;
+ const Locator* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp Tue Oct 21 09:34:02 2008
@@ -61,7 +61,7 @@
FunctionNormalizeSpace::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (context == 0)
{
@@ -106,7 +106,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp Tue Oct 21 09:34:02 2008
@@ -58,14 +58,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp Tue Oct 21 09:34:02 2008
@@ -56,7 +56,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionString.cpp Tue Oct 21 09:34:02 2008
@@ -51,7 +51,7 @@
FunctionString::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (context == 0)
{
@@ -98,7 +98,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp Tue Oct 21 09:34:02 2008
@@ -62,14 +62,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp Tue Oct 21 09:34:02 2008
@@ -205,7 +205,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -221,7 +221,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp Tue Oct 21 09:34:02 2008
@@ -66,7 +66,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
@@ -75,7 +75,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const;
+ const Locator* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp Tue Oct 21 09:34:02 2008
@@ -60,7 +60,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp Tue Oct 21 09:34:02 2008
@@ -56,7 +56,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.cpp Tue Oct 21 09:34:02 2008
@@ -60,7 +60,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp Tue Oct 21 09:34:02 2008
@@ -56,7 +56,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp Tue Oct 21 09:34:02 2008
@@ -53,7 +53,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() == false);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp Tue Oct 21 09:34:02 2008
@@ -57,7 +57,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XPath/XPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.cpp Tue Oct 21 09:34:02 2008
@@ -63,15 +63,21 @@
-XPath::XPath(MemoryManager& theManager, const LocatorType* theLocator) :
+XPath::XPath(
+ MemoryManager& theManager,
+ const Locator* theLocator) :
m_expression(theManager),
m_locator(theLocator),
m_inStylesheet(false)
{
}
+
+
XPath*
-XPath::create(MemoryManager& theManager, const LocatorType* theLocator)
+XPath::create(
+ MemoryManager& theManager,
+ const Locator* theLocator)
{
typedef XPath Type;
@@ -4766,7 +4772,7 @@
XPathConstructionContext& theConstructionContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator,
+ const Locator* theLocator,
eMatchScore* theMatchScore) :
m_executionContext(0),
m_targetNamespace(0),
@@ -4815,7 +4821,7 @@
XPathConstructionContext& theConstructionContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator)
+ const Locator* theLocator)
{
const XalanDOMString::size_type theLength =
theNameTest.length();
Modified: xalan/c/trunk/src/xalanc/XPath/XPath.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.hpp Tue Oct 21 09:34:02 2008
@@ -159,7 +159,7 @@
/**
* Construct an XPath.
*
- * @param theLocator The applicable LocatorType, if any.
+ * @param theLocator The applicable Locator, if any.
*/
explicit
XPath(
@@ -1014,14 +1014,14 @@
m_inStylesheet = fValue;
}
- const LocatorType*
+ const Locator*
getLocator() const
{
return m_locator;
}
void
- setLocator(const LocatorType* theLocator)
+ setLocator(const Locator* theLocator)
{
m_locator = theLocator;
}
@@ -1045,7 +1045,7 @@
XPathConstructionContext& theContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator = 0,
+ const Locator* theLocator = 0,
eMatchScore* theMatchScore = 0);
NodeTester(
@@ -1088,7 +1088,7 @@
XPathConstructionContext& theConstructionContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator);
+ const Locator* theLocator);
eMatchScore
initialize(
@@ -2646,9 +2646,9 @@
XPathExpression m_expression;
/**
- * A LocatorType for reporting errors.
+ * A Locator for reporting errors.
*/
- const LocatorType* m_locator;
+ const Locator* m_locator;
/**
* If true, the XPath can allocated XObjects in more
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp Tue Oct 21 09:34:02 2008
@@ -165,7 +165,7 @@
* @param theNamespace namespace of function
* @param functionName extension function name
* @param argVec vector of arguments to function
- * @param locator A LocatorType instance for error reporting.
+ * @param locator A Locator instance for error reporting.
* @return pointer to XObject result
*/
virtual XObjectPtr
@@ -175,7 +175,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) const = 0;
+ const Locator* locator) const = 0;
/**
* Reset the instance.
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp Tue Oct 21 09:34:02 2008
@@ -403,7 +403,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) const
+ const Locator* locator) const
{
const Function* const theFunction = findFunction(theNamespace, functionName);
Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp Tue Oct 21 09:34:02 2008
@@ -186,7 +186,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual void
reset();
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp Tue Oct 21 09:34:02 2008
@@ -246,14 +246,14 @@
* a string to a QName.
*
* @param theName The name of the element
- * @param locator A LocatorType instance for error reporting
+ * @param locator A Locator instance for error reporting
*
* @return whether the given element is available or not
*/
virtual bool
elementAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const = 0;
+ const Locator* locator) const = 0;
/**
* Determine if a function is available.
@@ -269,7 +269,7 @@
* Determine if a function is available.
*
* @param theName The name of the function
- * @param locator A LocatorType instance for error reporting
+ * @param locator A Locator instance for error reporting
*
* @return whether the function is available or not
*/
@@ -285,7 +285,7 @@
* @param functionName extension function name
* @param context The context node
* @param argVec vector of arguments to function
- * @param locator A LocatorType instance for error reporting
+ * @param locator A Locator instance for error reporting
* @return pointer to XObject result
*/
virtual const XObjectPtr
@@ -517,7 +517,7 @@
* attribute on xsl:key
* @param ref value that must match the value found by the
* 'match' attribute on xsl:key
- * @param locator The LocatorType to use for error reporting. Can be 0.
+ * @param locator The Locator to use for error reporting. Can be 0.
* @param nodelist A node list to contain the nodes found
*/
virtual void
@@ -525,7 +525,7 @@
XalanNode* context,
const XalanQName& qname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist) = 0;
/**
@@ -537,7 +537,7 @@
* qname using the provided resolver.
* @param ref value that must match the value found by the
* 'match' attribute on xsl:key
- * @param locator The LocatorType to use for error reporting. Can be 0.
+ * @param locator The Locator to use for error reporting. Can be 0.
* @param nodelist A node list to contain the nodes found
*/
virtual void
@@ -545,7 +545,7 @@
XalanNode* context,
const XalanDOMString& name,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist) = 0;
/**
@@ -559,7 +559,7 @@
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const LocatorType* locator = 0) = 0;
+ const Locator* locator = 0) = 0;
/**
* Retrieve the resolver for namespaces.
@@ -679,7 +679,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0) = 0;
+ const Locator* locator = 0) = 0;
/**
* Formats a number according to the specified pattern.
@@ -698,7 +698,7 @@
const XalanDOMString& dfsName,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0) = 0;
+ const Locator* locator = 0) = 0;
// These interfaces are inherited from ExecutionContext...
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp Tue Oct 21 09:34:02 2008
@@ -322,7 +322,7 @@
bool
XPathExecutionContextDefault::elementAvailable(
const XalanDOMString& theName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
assert(m_xpathEnvSupport != 0);
@@ -348,7 +348,7 @@
bool
XPathExecutionContextDefault::functionAvailable(
const XalanDOMString& theName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
assert(m_xpathEnvSupport != 0);
@@ -367,7 +367,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_xpathEnvSupport != 0);
@@ -445,7 +445,7 @@
XalanNode* /* context */,
const XalanQName& /* qname */,
const XalanDOMString& /* ref */,
- const LocatorType* /* locator */,
+ const Locator* const /* locator */,
MutableNodeRefList& /* nodelist */)
{
}
@@ -457,7 +457,7 @@
XalanNode* /* context */,
const XalanDOMString& /* name */,
const XalanDOMString& /* ref */,
- const LocatorType* /* locator */,
+ const Locator* const /* locator */,
MutableNodeRefList& /* nodelist */)
{
}
@@ -467,7 +467,7 @@
const XObjectPtr
XPathExecutionContextDefault::getVariable(
const XalanQName& name,
- const LocatorType* /* locator */)
+ const Locator* const /* locator */)
{
assert(m_xobjectFactory != 0);
@@ -534,7 +534,7 @@
XPathExecutionContextDefault::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -563,7 +563,7 @@
XPathExecutionContextDefault::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -581,7 +581,7 @@
XPathExecutionContextDefault::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -622,7 +622,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator)
+ const Locator* locator)
{
doFormatNumber(number, pattern, 0, theResult, context, locator);
}
@@ -635,7 +635,7 @@
const XalanDOMString& /* dfsName */,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator)
+ const Locator* locator)
{
doFormatNumber(number, pattern, 0, theResult, context, locator);
}
@@ -648,7 +648,7 @@
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator)
+ const Locator* locator)
{
if (DoubleSupport::isNaN(number) == true)
{
Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp Tue Oct 21 09:34:02 2008
@@ -174,7 +174,7 @@
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
// These interfaces are inherited from XPathExecutionContext...
@@ -216,7 +216,7 @@
virtual bool
elementAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual bool
functionAvailable(const XalanQName& theQName) const;
@@ -224,7 +224,7 @@
virtual bool
functionAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual const XObjectPtr
extFunction(
@@ -232,7 +232,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator);
+ const Locator* locator);
virtual XalanDocument*
parseXML(
@@ -261,7 +261,7 @@
XalanNode* context,
const XalanQName& qname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist);
virtual void
@@ -269,13 +269,13 @@
XalanNode* context,
const XalanDOMString& name,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist);
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual const PrefixResolver*
getPrefixResolver() const;
@@ -307,7 +307,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual void formatNumber(
double number,
@@ -315,7 +315,7 @@
const XalanDOMString& dfsName,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
// These interfaces are inherited from ExecutionContext...
@@ -339,19 +339,19 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
+ const Locator* locator = 0) const;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
+ const Locator* locator = 0) const;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
+ const Locator* locator = 0) const;
virtual bool
shouldStripSourceNode(const XalanText& node);
Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessor.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessor.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessor.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessor.hpp Tue Oct 21 09:34:02 2008
@@ -39,6 +39,10 @@
+XALAN_USING_XERCES(Locator)
+
+
+
class Function;
class PrefixResolver;
class XPath;
@@ -66,7 +70,7 @@
* @param constructionContext The construction context
* @param expression expression that will be evaluated
* @param resolver prefix resolver to use
- * @param locator the LocatorType to use for error report. May be null
+ * @param locator the Locator to use for error report. May be null
* @param allowVariableReferences If true, variable references are allowed.
* @param allowKeyFunction If true, calls to the key() function are allowed.
*/
@@ -76,7 +80,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool allowVariableReferences = true,
bool allowKeyFunction = true) = 0;
@@ -87,7 +91,7 @@
* @param constructionContext The construction context
* @param expression expression that will be evaluated
* @param resolver prefix resolver to use
- * @param locator the LocatorType to use for error report. May be null
+ * @param locator the Locator to use for error report. May be null
* @param allowVariableReferences If true, variable references are allowed.
* @param allowKeyFunction If true, calls to the key() function are allowed.
*/
@@ -97,7 +101,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool allowVariableReferences = true,
bool allowKeyFunction = true) = 0;
Modified: xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.cpp Tue Oct 21 09:34:02 2008
@@ -191,7 +191,7 @@
XalanQNameByValue::set(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault)
{
initialize(
@@ -208,7 +208,7 @@
XalanQNameByValue::set(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault)
{
assert(qname != 0);
@@ -227,7 +227,7 @@
XalanQNameByValue::set(
const XalanDOMString& qname,
const PrefixResolver* theResolver,
- const LocatorType* locator)
+ const Locator* locator)
{
resolvePrefix(
qname.c_str(),
@@ -242,7 +242,7 @@
XalanQNameByValue::set(
const XalanDOMChar* qname,
const PrefixResolver* theResolver,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(qname != 0);
@@ -382,7 +382,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type theLength,
const PrefixResolver* theResolver,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanDOMString::size_type indexOfNSSep = indexOf(qname, XalanUnicode::charColon);
Modified: xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanQNameByValue.hpp Tue Oct 21 09:34:02 2008
@@ -198,7 +198,7 @@
set(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
/**
@@ -215,7 +215,7 @@
set(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
/**
@@ -231,7 +231,7 @@
set(
const XalanDOMString& qname,
const PrefixResolver* theResolver = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Set the local part and namespace URI of a XalanQNameByValue from
@@ -246,7 +246,7 @@
set(
const XalanDOMChar* qname,
const PrefixResolver* theResolver = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Clear the instance.
*/
@@ -283,7 +283,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type len,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault);
void
@@ -291,13 +291,13 @@
const XalanDOMChar* qname,
XalanDOMString::size_type theLength,
const PrefixResolver* theResolver,
- const LocatorType* locator);
+ const Locator* locator);
void
validate(
const XalanDOMChar* qname,
XalanDOMString::size_type theLength,
- const LocatorType* locator);
+ const Locator* locator);
// Data members...
XalanDOMString m_namespace;
Modified: xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp Tue Oct 21 09:34:02 2008
@@ -44,7 +44,6 @@
typedef XalanQNameByValue data_type;
typedef data_type::NamespacesStackType NamespacesStackType;
- typedef data_type::LocatorType LocatorType;
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<data_type> ArenaBlockType;
@@ -61,7 +60,9 @@
*
* @param theBlockSize The block size.
*/
- XalanQNameByValueAllocator(MemoryManager& theManager, size_type theBlockCount);
+ XalanQNameByValueAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount);
~XalanQNameByValueAllocator();
@@ -102,7 +103,7 @@
create(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
/**
@@ -119,7 +120,7 @@
create(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
/**
@@ -135,7 +136,7 @@
create(
const XalanDOMString& qname,
const PrefixResolver* theResolver = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Determine if an object is owned by the allocator...
Modified: xalan/c/trunk/src/xalanc/XSLT/AVT.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/AVT.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/AVT.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/AVT.cpp Tue Oct 21 09:34:02 2008
@@ -81,7 +81,7 @@
*/
AVT::AVT(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver) :
@@ -351,7 +351,7 @@
void
AVT::nextToken(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
StringTokenizer& tokenizer,
XalanDOMString& token)
{
Modified: xalan/c/trunk/src/xalanc/XSLT/AVT.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/AVT.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/AVT.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/AVT.hpp Tue Oct 21 09:34:02 2008
@@ -36,6 +36,7 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+XALAN_USING_XERCES(Locator)
@@ -74,7 +75,7 @@
*/
AVT(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver);
@@ -159,7 +160,7 @@
void
nextToken(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
StringTokenizer& tokenizer,
XalanDOMString& token);
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp Tue Oct 21 09:34:02 2008
@@ -147,7 +147,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanFileLoc lineNumber = XalanLocator::getLineNumber(locator);
const XalanFileLoc columnNumber = XalanLocator::getColumnNumber(locator);
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.hpp Tue Oct 21 09:34:02 2008
@@ -90,7 +90,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
const AttributeListType& atts,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual void
postConstruction(
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemMessage.cpp Tue Oct 21 09:34:02 2008
@@ -158,7 +158,7 @@
executionContext,
theResult.get());
- const LocatorType* const theLocator = getLocator();
+ const Locator* const theLocator = getLocator();
executionContext.message(
theString,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp Tue Oct 21 09:34:02 2008
@@ -140,7 +140,7 @@
-const LocatorType*
+const Locator*
ElemTemplateElement::getLocator() const
{
return &m_locatorProxy;
@@ -951,7 +951,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& /* theStylesheet */,
const AttributeListType& /* atts */,
- const LocatorType* locator)
+ const Locator* locator)
{
error(
constructionContext,
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.hpp Tue Oct 21 09:34:02 2008
@@ -123,7 +123,7 @@
*
* @return The Locator for the node.
*/
- virtual const LocatorType*
+ virtual const Locator*
getLocator() const;
/**
@@ -369,7 +369,7 @@
StylesheetConstructionContext& constructionContext,
Stylesheet& theStylesheet,
const AttributeListType& atts,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Sets a flag indicating this is the default template
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemUse.cpp Tue Oct 21 09:34:02 2008
@@ -256,8 +256,8 @@
{
assert(canGenerateAttributes() == true);
- const StylesheetRoot& theStylesheetRoot = getStylesheet().getStylesheetRoot();
- const LocatorType* const theLocator = getLocator();
+ const StylesheetRoot& theStylesheetRoot = getStylesheet().getStylesheetRoot();
+ const Locator* const theLocator = getLocator();
for(size_type i = 0; i < m_attributeSetsNamesCount; ++i)
{
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp Tue Oct 21 09:34:02 2008
@@ -159,7 +159,7 @@
}
void
- setDocumentLocator(const LocatorType* const /* locator */)
+ setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp Tue Oct 21 09:34:02 2008
@@ -47,7 +47,7 @@
FunctionCurrent::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
- const LocatorType* /* locator */) const
+ const Locator* const /* locator */) const
{
assert(executionContext.getCurrentNode() != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp Tue Oct 21 09:34:02 2008
@@ -57,7 +57,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp Tue Oct 21 09:34:02 2008
@@ -205,7 +205,7 @@
const XalanDOMString& base,
BorrowReturnMutableNodeRefList& mnl,
const XalanNode* sourceNode,
- const LocatorType* locator)
+ const Locator* locator)
{
XalanDocument* newDoc = executionContext.getSourceDocument(uri);
@@ -243,7 +243,7 @@
const XalanDOMString& uri,
BorrowReturnMutableNodeRefList& mnl,
const XalanNode* sourceNode,
- const LocatorType* locator)
+ const Locator* locator)
{
getDoc(
executionContext,
@@ -262,7 +262,7 @@
const XalanDOMString& uri,
const XalanNode* resolver,
BorrowReturnMutableNodeRefList& mnl,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(resolver != 0);
@@ -286,7 +286,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false);
@@ -316,7 +316,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp Tue Oct 21 09:34:02 2008
@@ -53,7 +53,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
@@ -61,7 +61,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -86,7 +86,7 @@
const XObjectPtr& arg,
XalanDOMString* base,
int argCount,
- const LocatorType* locator,
+ const Locator* locator,
bool fNoRelativeURI = false) const;
// Not implemented...
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp Tue Oct 21 09:34:02 2008
@@ -58,7 +58,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp Tue Oct 21 09:34:02 2008
@@ -46,7 +46,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -74,7 +74,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() == false);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp Tue Oct 21 09:34:02 2008
@@ -52,7 +52,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual XObjectPtr
execute(
@@ -61,7 +61,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org