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 [2/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...
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg.null() == false);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.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/FunctionGenerateID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp Tue Oct 21 09:34:02 2008
@@ -77,7 +77,7 @@
FunctionGenerateID::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (context == 0)
{
@@ -114,7 +114,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/FunctionGenerateID.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp Tue Oct 21 09:34:02 2008
@@ -56,14 +56,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/XSLT/FunctionKey.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionKey.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionKey.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionKey.cpp Tue Oct 21 09:34:02 2008
@@ -63,7 +63,7 @@
XalanNode* context,
const XalanDOMString& keyname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& theNodeRefList)
{
assert(context != 0);
@@ -98,7 +98,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/FunctionKey.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp Tue Oct 21 09:34:02 2008
@@ -59,7 +59,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/XSLT/FunctionSystemProperty.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp Tue Oct 21 09:34:02 2008
@@ -83,7 +83,7 @@
validateNCName(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMString& ncname)
{
if (XalanQName::isValidNCName(ncname) == false)
@@ -109,7 +109,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/FunctionSystemProperty.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp Tue Oct 21 09:34:02 2008
@@ -55,7 +55,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/FunctionUnparsedEntityURI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp Tue Oct 21 09:34:02 2008
@@ -52,7 +52,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(arg.null() == false);
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp Tue Oct 21 09:34:02 2008
@@ -54,7 +54,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/Stylesheet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp Tue Oct 21 09:34:02 2008
@@ -228,7 +228,7 @@
ElemTemplateElement*
Stylesheet::initWrapperless(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator)
+ const Locator* locator)
{
if (m_isWrapperless == true)
{
@@ -269,7 +269,7 @@
Stylesheet::processKeyElement(
const PrefixResolver& nsContext,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
StylesheetConstructionContext& constructionContext)
{
const XalanQName* theQName = 0;
@@ -1588,7 +1588,7 @@
Stylesheet::processDecimalFormatElement(
StylesheetConstructionContext& constructionContext,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp Tue Oct 21 09:34:02 2008
@@ -459,7 +459,7 @@
processDecimalFormatElement(
StylesheetConstructionContext& constructionContext,
const AttributeListType& atts,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Retrieve the XalanDecimalFormatSymbols instance associated with
@@ -496,7 +496,7 @@
ElemTemplateElement*
initWrapperless(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Retrieve the stack of who's including who
@@ -521,7 +521,7 @@
processKeyElement(
const PrefixResolver& nsContext,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
StylesheetConstructionContext& constructionContext);
/**
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.hpp Tue Oct 21 09:34:02 2008
@@ -534,7 +534,7 @@
*/
virtual const AVT*
createAVT(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver) = 0;
@@ -563,7 +563,7 @@
*/
virtual const AVTPart*
createAVTPart(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver) = 0;
@@ -601,7 +601,7 @@
createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false) = 0;
/**
@@ -617,7 +617,7 @@
createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false) = 0;
/**
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp Tue Oct 21 09:34:02 2008
@@ -405,7 +405,7 @@
XPath*
StylesheetConstructionContextDefault::createMatchPattern(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMString& str,
const PrefixResolver& resolver,
bool allowVariableReferences,
@@ -438,7 +438,7 @@
XPath*
StylesheetConstructionContextDefault::createMatchPattern(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver,
bool allowVariableReferences,
@@ -460,7 +460,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMString& str,
const PrefixResolver& resolver,
bool allowVariableReferences,
@@ -493,7 +493,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
const PrefixResolver& resolver,
bool allowVariableReferences,
@@ -515,7 +515,7 @@
XPath*
StylesheetConstructionContextDefault::createXPath(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver,
@@ -536,7 +536,7 @@
-const LocatorType*
+const Locator*
StylesheetConstructionContextDefault::getLocatorFromStack() const
{
return m_processor.getLocatorFromStack();
@@ -545,7 +545,7 @@
void
-StylesheetConstructionContextDefault::pushLocatorOnStack(const LocatorType* locator)
+StylesheetConstructionContextDefault::pushLocatorOnStack(const Locator* locator)
{
m_processor.pushLocatorOnStack(locator);
}
@@ -588,7 +588,7 @@
StylesheetConstructionContextDefault::isXMLSpaceAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator)
+ const Locator* theLocator)
{
assert(theAttributeName != 0);
@@ -607,7 +607,7 @@
StylesheetConstructionContextDefault::isXSLUseAttributeSetsAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator)
+ const Locator* theLocator)
{
assert(theAttributeName != 0);
@@ -626,7 +626,7 @@
StylesheetConstructionContextDefault::isValidQName(
const XalanDOMChar* theName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator)
+ const Locator* theLocator)
{
assert(theName != 0);
@@ -675,7 +675,7 @@
int token,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
@@ -999,7 +999,7 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanFileLoc lineNumber =
XalanLocator::getLineNumber(locator);
@@ -1063,7 +1063,7 @@
const XalanDOMChar* name,
const AttributeListType& atts,
ExtensionNSHandler& handler,
- const LocatorType* locator)
+ const Locator* locator)
{
m_allocatedElements.push_back(0);
@@ -1089,7 +1089,7 @@
XalanDOMString::size_type length,
bool preserveSpace,
bool disableOutputEscaping,
- const LocatorType* locator)
+ const Locator* locator)
{
return m_elemTextLiteralAllocator.create(
*this,
@@ -1252,7 +1252,7 @@
const AVT*
StylesheetConstructionContextDefault::createAVT(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver)
@@ -1282,7 +1282,7 @@
const AVTPart*
StylesheetConstructionContextDefault::createAVTPart(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver)
@@ -1321,7 +1321,7 @@
StylesheetConstructionContextDefault::createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault)
{
return m_xalanQNameByValueAllocator.create(
@@ -1337,7 +1337,7 @@
StylesheetConstructionContextDefault::createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault)
{
return m_xalanQNameByValueAllocator.create(
@@ -1354,7 +1354,7 @@
size_type& count,
const XalanDOMChar* qnameTokens,
const NamespacesStackType& namespaces,
- const LocatorType* locator,
+ const Locator* locator,
bool fUseDefault)
{
assert(qnameTokens != 0);
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp Tue Oct 21 09:34:02 2008
@@ -290,19 +290,19 @@
isXMLSpaceAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator = 0);
+ const Locator* theLocator = 0);
virtual bool
isXSLUseAttributeSetsAttribute(
const XalanDOMChar* theAttributeName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator = 0);
+ const Locator* theLocator = 0);
virtual bool
isValidQName(
const XalanDOMChar* theName,
const Stylesheet& theStylesheet,
- const LocatorType* theLocator = 0);
+ const Locator* theLocator = 0);
virtual eElementToken
getElementToken(const XalanDOMString& name) const;
@@ -321,7 +321,7 @@
virtual const AVT*
createAVT(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver);
@@ -333,7 +333,7 @@
virtual const AVTPart*
createAVTPart(
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* str,
XalanDOMString::size_type len,
const PrefixResolver& resolver);
@@ -348,14 +348,14 @@
createXalanQName(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
virtual const XalanQName*
createXalanQName(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
virtual const XalanQName**
@@ -363,7 +363,7 @@
size_type& count,
const XalanDOMChar* qnameTokens,
const NamespacesStackType& namespaces,
- const LocatorType* locator = 0,
+ const Locator* locator = 0,
bool fUseDefault = false);
virtual ElemTemplateElement*
@@ -371,7 +371,7 @@
int token,
Stylesheet& stylesheetTree,
const AttributeListType& atts,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual ElemTemplateElement*
createElement(
@@ -379,7 +379,7 @@
Stylesheet& stylesheetTree,
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual ElemTemplateElement*
createElement(
@@ -388,7 +388,7 @@
XalanDOMString::size_type length,
bool preserveSpace,
bool disableOutputEscaping,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual ElemTemplateElement*
createElement(
@@ -396,7 +396,7 @@
const XalanDOMChar* name,
const AttributeListType& atts,
ExtensionNSHandler& handler,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual const XalanMatchPatternData*
createXalanMatchPatternData(
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Tue Oct 21 09:34:02 2008
@@ -1080,7 +1080,7 @@
virtual void
cloneToResultTree(
const XalanNode& node,
- const LocatorType* locator) = 0;
+ const Locator* locator) = 0;
/**
* Clone a node to the result tree
@@ -1097,7 +1097,7 @@
XalanNode::NodeType nodeType,
bool overrideStrip,
bool shouldCloneAttributes,
- const LocatorType* locator) = 0;
+ const Locator* locator) = 0;
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
@@ -1154,7 +1154,7 @@
virtual void
outputToResultTree(
const XObject& xobj,
- const LocatorType* locator) = 0;
+ const Locator* locator) = 0;
/**
* Given a result tree fragment, walk the tree and
@@ -1166,7 +1166,7 @@
virtual void
outputResultTreeFragment(
const XObject& theTree,
- const LocatorType* locator) = 0;
+ const Locator* locator) = 0;
/**
* Determine the full XSLT Namespace URI.
@@ -1827,14 +1827,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.
@@ -1850,14 +1850,14 @@
* 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
*/
virtual bool
functionAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const = 0;
+ const Locator* locator) const = 0;
virtual const XObjectPtr
extFunction(
@@ -1865,7 +1865,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) = 0;
+ const Locator* locator) = 0;
virtual XalanDocument*
parseXML(
@@ -1943,7 +1943,7 @@
XalanNode* context,
const XalanQName& qname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist) = 0;
virtual void
@@ -1951,13 +1951,13 @@
XalanNode* context,
const XalanDOMString& name,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist) = 0;
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const LocatorType* locator = 0) = 0;
+ const Locator* locator = 0) = 0;
virtual const PrefixResolver*
getPrefixResolver() const = 0;
@@ -1993,7 +1993,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0) = 0;
+ const Locator* locator = 0) = 0;
virtual void
formatNumber(
@@ -2002,7 +2002,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/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Tue Oct 21 09:34:02 2008
@@ -1041,7 +1041,7 @@
void
StylesheetExecutionContextDefault::cloneToResultTree(
const XalanNode& node,
- const LocatorType* locator)
+ const Locator* locator)
{
m_xsltProcessor->cloneToResultTree(node, getCopyTextNodesOnly(), locator);
}
@@ -1054,7 +1054,7 @@
XalanNode::NodeType nodeType,
bool overrideStrip,
bool shouldCloneAttributes,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_xsltProcessor != 0);
@@ -1200,7 +1200,7 @@
void
StylesheetExecutionContextDefault::outputToResultTree(
const XObject& xobj,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_xsltProcessor != 0);
@@ -1212,7 +1212,7 @@
void
StylesheetExecutionContextDefault::outputResultTreeFragment(
const XObject& theTree,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_xsltProcessor != 0);
@@ -1288,7 +1288,7 @@
if (findOnElementRecursionStack(theElement) == true)
{
- const LocatorType* const theLocator = theElement->getLocator();
+ const Locator* const theLocator = theElement->getLocator();
const GetCachedString theGuard(*this);
@@ -1734,7 +1734,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanDecimalFormatSymbols * theDFS = getDecimalFormatSymbols(theEmptyQName);
@@ -1770,7 +1770,7 @@
const XalanDOMString& dfsName,
XalanDOMString& theResult,
const XalanNode* context,
- const LocatorType* locator)
+ const Locator* locator)
{
XalanQNameByValue& theDFSQName = m_xpathExecutionContextDefault.getScratchQName();
@@ -2006,7 +2006,7 @@
bool
StylesheetExecutionContextDefault::elementAvailable(
const XalanDOMString& theName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
XalanQNameByValue& theQName = m_xpathExecutionContextDefault.getScratchQName();
@@ -2028,7 +2028,7 @@
bool
StylesheetExecutionContextDefault::functionAvailable(
const XalanDOMString& theName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
return m_xpathExecutionContextDefault.functionAvailable(theName, theLocator);
}
@@ -2041,7 +2041,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_xpathExecutionContextDefault.getXPathEnvSupport() != 0);
@@ -2133,7 +2133,7 @@
XalanNode* context,
const XalanQName& qname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist)
{
assert(m_stylesheetRoot != 0);
@@ -2156,7 +2156,7 @@
XalanNode* context,
const XalanDOMString& name,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist)
{
assert(m_stylesheetRoot != 0);
@@ -2186,7 +2186,7 @@
const XObjectPtr
StylesheetExecutionContextDefault::getVariable(
const XalanQName& name,
- const LocatorType* locator)
+ const Locator* locator)
{
bool fFound;
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp Tue Oct 21 09:34:02 2008
@@ -476,7 +476,7 @@
virtual void
cloneToResultTree(
const XalanNode& node,
- const LocatorType* locator);
+ const Locator* locator);
virtual void
cloneToResultTree(
@@ -484,14 +484,12 @@
XalanNode::NodeType nodeType,
bool overrideStrip,
bool shouldCloneAttributes,
- const LocatorType* locator);
+ const Locator* locator);
#if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
virtual void
- beginCreateXResultTreeFrag(
- XalanNode* sourceNode);
+ beginCreateXResultTreeFrag(XalanNode* sourceNode);
-
virtual const XObjectPtr
endCreateXResultTreeFrag();
@@ -513,12 +511,12 @@
virtual void
outputToResultTree(
const XObject& xobj,
- const LocatorType* locator);
+ const Locator* locator);
virtual void
outputResultTreeFragment(
const XObject& theTree,
- const LocatorType* locator);
+ const Locator* locator);
virtual const XalanDOMString&
getXSLNameSpaceURL() const;
@@ -723,7 +721,7 @@
const XalanDecimalFormatSymbols* theDFS,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0) const = 0;
+ const Locator* locator = 0) const = 0;
};
virtual void
@@ -732,7 +730,7 @@
const XalanDOMString& pattern,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
virtual void
formatNumber(
@@ -741,7 +739,7 @@
const XalanDOMString& dfsName,
XalanDOMString& theResult,
const XalanNode* context = 0,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
const FormatNumberFunctor*
@@ -820,7 +818,7 @@
virtual bool
elementAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual bool
functionAvailable(const XalanQName& theQName) const;
@@ -828,7 +826,7 @@
virtual bool
functionAvailable(
const XalanDOMString& theName,
- const LocatorType* locator) const;
+ const Locator* locator) const;
virtual const XObjectPtr
extFunction(
@@ -836,7 +834,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator);
+ const Locator* locator);
virtual XalanDocument*
parseXML(
@@ -916,7 +914,7 @@
XalanNode* context,
const XalanQName& qname,
const XalanDOMString& ref,
- const LocatorType* locator,
+ const Locator* locator,
MutableNodeRefList& nodelist);
virtual void
@@ -924,13 +922,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;
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Tue Oct 21 09:34:02 2008
@@ -156,7 +156,7 @@
const XalanDOMChar* aname,
const AttributeListType& atts,
XalanSize_t which,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserve)
{
if (m_constructionContext.isXMLSpaceAttribute(aname, m_stylesheet, locator) == false)
@@ -201,7 +201,7 @@
StylesheetHandler::processSpaceAttr(
const XalanDOMChar* elementName,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserve)
{
const XalanSize_t len = atts.getLength();
@@ -251,7 +251,7 @@
m_whiteSpaceElems.clear();
- const LocatorType* const locator = m_constructionContext.getLocatorFromStack();
+ const Locator* const locator = m_constructionContext.getLocatorFromStack();
// First push namespaces
m_stylesheet.pushNamespaces(atts);
@@ -717,7 +717,7 @@
StylesheetHandler::initWrapperless(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_pTemplate == 0);
@@ -779,7 +779,7 @@
const XalanDOMChar* name,
const AttributeListType& atts,
int xslToken,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserveSpace,
bool& fSpaceAttrProcessed)
{
@@ -946,7 +946,7 @@
StylesheetHandler::processStylesheet(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserveSpace,
bool& fSpaceAttrProcessed)
{
@@ -1044,7 +1044,7 @@
const XalanDOMChar* /* name */,
const XalanDOMString& /* localName */,
const AttributeListType& /* atts */,
- const LocatorType* /* locator */)
+ const Locator* /* locator */)
{
}
@@ -1053,7 +1053,7 @@
void
StylesheetHandler::checkForOrAddVariableName(
const XalanQName& theVariableName,
- const LocatorType* theLocator)
+ const Locator* theLocator)
{
if (inExtensionElement() == true)
{
@@ -1118,7 +1118,7 @@
StylesheetHandler::processPreserveStripSpace(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
int xslToken)
{
const XalanSize_t nAttrs = atts.getLength();
@@ -1199,7 +1199,7 @@
void
StylesheetHandler::appendChildElementToParent(
ElemTemplateElement* elem,
- const LocatorType* locator)
+ const Locator* locator)
{
appendChildElementToParent(m_elemStack.back(), elem, locator);
}
@@ -1210,7 +1210,7 @@
StylesheetHandler::appendChildElementToParent(
ElemTemplateElement* parent,
ElemTemplateElement* elem,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(parent != 0 && elem != 0);
@@ -1282,7 +1282,7 @@
StylesheetHandler::processImport(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanSize_t nAttrs = atts.getLength();
@@ -1398,7 +1398,7 @@
StylesheetHandler::processInclude(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator)
+ const Locator* locator)
{
const XalanSize_t nAttrs = atts.getLength();
@@ -1883,7 +1883,7 @@
StylesheetHandler::illegalAttributeError(
const XalanDOMChar* theElementName,
const XalanDOMChar* theAttributeName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
const GetCachedString theGuard(m_constructionContext);
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp Tue Oct 21 09:34:02 2008
@@ -271,7 +271,7 @@
* any SAX document event.
* @see org.xml.sax.Locator
*/
- virtual void setDocumentLocator(const LocatorType* const locator);
+ virtual void setDocumentLocator(const Locator* const locator);
/**
* Receive notification of the beginning of a document.
@@ -377,7 +377,7 @@
const XalanDOMChar* aname,
const AttributeListType& atts,
XalanSize_t which,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserve);
/**
@@ -393,7 +393,7 @@
processSpaceAttr(
const XalanDOMChar* elementName,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserve);
/**
@@ -403,7 +403,7 @@
processImport(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Process xsl:include.
@@ -412,7 +412,7 @@
processInclude(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator);
+ const Locator* locator);
void
doCleanup();
@@ -432,52 +432,52 @@
illegalAttributeError(
const XalanDOMChar* theElementName,
const XalanDOMChar* theAttributeName,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
error(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
error(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
error(
const XalanDOMString& theMessage1,
const XalanDOMChar* theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
error(
const XalanDOMString& theMessage1,
const XalanDOMString& theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
warn(
const XalanDOMChar* theMessage1,
const XalanDOMChar* theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
warn(
const XalanDOMChar* theMessage1,
const XalanDOMString& theMessage2,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
warn(
const XalanDOMString& theMessage,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
error(
const XalanDOMString& theMessage,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
void
processText(
@@ -497,7 +497,7 @@
const XalanDOMChar* name,
const AttributeListType& atts,
int xslToken,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserveSpace,
bool& fSpaceAttrProcessed);
@@ -505,7 +505,7 @@
processStylesheet(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
bool& fPreserveSpace,
bool& fSpaceAttrProcessed);
@@ -513,13 +513,13 @@
processPreserveStripSpace(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator,
+ const Locator* locator,
int xslToken);
void
appendChildElementToParent(
ElemTemplateElement* elem,
- const LocatorType* locator);
+ const Locator* locator);
void
appendChildElementToParent(
@@ -530,7 +530,7 @@
appendChildElementToParent(
ElemTemplateElement* parent,
ElemTemplateElement* elem,
- const LocatorType* locator);
+ const Locator* locator);
bool
inExtensionElement() const;
@@ -540,12 +540,12 @@
const XalanDOMChar* name,
const XalanDOMString& localName,
const AttributeListType& atts,
- const LocatorType* locator);
+ const Locator* locator);
void
checkForOrAddVariableName(
const XalanQName& theVariableName,
- const LocatorType* theLocator);
+ const Locator* theLocator);
// Data members...
@@ -731,7 +731,7 @@
initWrapperless(
const XalanDOMChar* name,
const AttributeListType& atts,
- const LocatorType* locator);
+ const Locator* locator);
const XalanDOMString*
getNamespaceFromStack(const XalanDOMChar* theName,
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp Tue Oct 21 09:34:02 2008
@@ -481,7 +481,7 @@
{
const XalanSize_t nAttrs = atts.getLength();
- const LocatorType* const theLocator = constructionContext.getLocatorFromStack();
+ const Locator* const theLocator = constructionContext.getLocatorFromStack();
for (XalanSize_t i = 0; i < nAttrs; i++)
{
@@ -818,7 +818,7 @@
const PrefixResolver& resolver,
MutableNodeRefList& nodelist,
StylesheetExecutionContext& executionContext,
- const LocatorType* locator,
+ const Locator* locator,
KeyTablesTableType& theKeysTable) const
{
assert(
@@ -940,7 +940,7 @@
StylesheetExecutionContext& executionContext,
const XalanQName& theQName,
size_type matchingIndex,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
const AttributeSetMapType::const_iterator i =
m_attributeSetsMap.find(&theQName);
@@ -979,7 +979,7 @@
StylesheetRoot::executeAttributeSet(
StylesheetExecutionContext& theExecutionContext,
const XalanQName& theQName,
- const LocatorType* theLocator) const
+ const Locator* theLocator) const
{
const AttributeSetMapType::const_iterator i =
m_attributeSetsMap.find(&theQName);
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp Tue Oct 21 09:34:02 2008
@@ -402,7 +402,7 @@
const PrefixResolver& resolver,
MutableNodeRefList& nodelist,
StylesheetExecutionContext& executionContext,
- const LocatorType* locator,
+ const Locator* locator,
KeyTablesTableType& theKeysTable) const;
unsigned long
@@ -459,13 +459,13 @@
StylesheetExecutionContext& theExecutionContext,
const XalanQName& theQName,
size_type matchingIndex,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
#else
void
executeAttributeSet(
StylesheetExecutionContext& theExecutionContext,
const XalanQName& theQName,
- const LocatorType* theLocator) const;
+ const Locator* theLocator) const;
#endif
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Tue Oct 21 09:34:02 2008
@@ -1113,7 +1113,7 @@
void
-XSLTEngineImpl::setDocumentLocator(const LocatorType* /* locator */)
+XSLTEngineImpl::setDocumentLocator(const Locator* /* locator */)
{
// Do nothing for now
}
@@ -1249,7 +1249,7 @@
const XalanDOMChar* value,
size_type theLength,
bool fromCopy,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(value != 0);
@@ -1356,7 +1356,7 @@
void
XSLTEngineImpl::reportDuplicateNamespaceNodeError(
const XalanDOMString& theName,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_executionContext != 0);
@@ -1943,7 +1943,7 @@
void
XSLTEngineImpl::warnCopyTextNodesOnly(
const XalanNode* sourceNode,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(m_executionContext != 0);
@@ -1987,7 +1987,7 @@
XSLTEngineImpl::cloneToResultTree(
const XalanNode& node,
bool cloneTextNodesOnly,
- const LocatorType* locator)
+ const Locator* locator)
{
XalanNode::NodeType posNodeType = node.getNodeType();
@@ -2142,7 +2142,7 @@
bool overrideStrip,
bool shouldCloneAttributes,
bool cloneTextNodesOnly,
- const LocatorType* locator)
+ const Locator* locator)
{
assert(nodeType == node.getNodeType());
assert(m_executionContext != 0);
@@ -2279,7 +2279,7 @@
XSLTEngineImpl::outputToResultTree(
const XObject& value,
bool outputTextNodesOnly,
- const LocatorType* locator)
+ const Locator* locator)
{
const XObject::eObjectType type = value.getType();
@@ -2392,7 +2392,7 @@
XSLTEngineImpl::outputResultTreeFragment(
const XalanDocumentFragment& theTree,
bool outputTextNodesOnly,
- const LocatorType* locator)
+ const Locator* locator)
{
for(XalanNode* child = theTree.getFirstChild(); child != 0; child = child->getNextSibling())
{
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp Tue Oct 21 09:34:02 2008
@@ -151,7 +151,7 @@
}
};
- typedef XalanVector<const LocatorType*> LocatorStack;
+ typedef XalanVector<const Locator*> LocatorStack;
typedef XalanVector<TraceListener*> TraceListenerVectorType;
typedef XalanVector<const XalanDOMString*> XalanDOMStringPointerVectorType;
@@ -483,7 +483,7 @@
const XalanDOMString& aname,
const XalanDOMString& value,
bool fromCopy = false,
- const LocatorType* locator = 0)
+ const Locator* locator = 0)
{
addResultAttribute(
attList,
@@ -509,7 +509,7 @@
const XalanDOMString& aname,
const XalanDOMChar* value,
bool fromCopy = false,
- const LocatorType* locator = 0)
+ const Locator* locator = 0)
{
addResultAttribute(
attList,
@@ -538,7 +538,7 @@
const XalanDOMChar* value,
size_type theLength,
bool fromCopy = false,
- const LocatorType* locator = 0);
+ const Locator* locator = 0);
/**
* Add attribute to pending attributes list, and if it is a namespace, add
@@ -554,7 +554,7 @@
const XalanDOMString& aname,
const XalanDOMChar* value,
bool fromCopy = false,
- const LocatorType* locator = 0)
+ const Locator* locator = 0)
{
assert(m_outputContextStack.empty() == false);
@@ -580,7 +580,7 @@
const XalanDOMString& aname,
const XalanDOMString& value,
bool fromCopy = false,
- const LocatorType* locator = 0)
+ const Locator* locator = 0)
{
assert(m_outputContextStack.empty() == false);
@@ -600,10 +600,10 @@
void
reportDuplicateNamespaceNodeError(
const XalanDOMString& theName,
- const LocatorType* locator);
+ const Locator* locator);
void
- setDocumentLocator(const LocatorType* locator);
+ setDocumentLocator(const Locator* locator);
void
startDocument();
@@ -747,7 +747,7 @@
cloneToResultTree(
const XalanNode& node,
bool cloneTextNodesOnly,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Clone a node to the result tree
@@ -766,7 +766,7 @@
bool overrideStrip,
bool shouldCloneAttributes,
bool cloneTextNodesOnly,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Output an object to the result tree by doing the right conversions.
@@ -779,7 +779,7 @@
outputToResultTree(
const XObject& value,
bool outputTextNodesOnly,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Given a result tree fragment, walk the tree and output it to the result
@@ -793,7 +793,7 @@
outputResultTreeFragment(
const XObject& theTree,
bool outputTextNodesOnly,
- const LocatorType* locator)
+ const Locator* locator)
{
outputResultTreeFragment(
theTree.rtree(),
@@ -813,7 +813,7 @@
outputResultTreeFragment(
const XalanDocumentFragment& theTree,
bool outputTextNodesOnly,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Retrieve the root stylesheet.
@@ -1209,7 +1209,7 @@
*
* @return A pointer to the Locator, or 0 if there is nothing on the stack.
*/
- const LocatorType*
+ const Locator*
getLocatorFromStack() const
{
return m_stylesheetLocatorStack.empty() == true ? 0 : m_stylesheetLocatorStack.back();
@@ -1221,7 +1221,7 @@
* @param A pointer to the Locator to push.
*/
void
- pushLocatorOnStack(const LocatorType* locator)
+ pushLocatorOnStack(const Locator* locator)
{
m_stylesheetLocatorStack.push_back(locator);
}
@@ -1420,7 +1420,7 @@
void
warnCopyTextNodesOnly(
const XalanNode* sourceNode,
- const LocatorType* locator);
+ const Locator* locator);
/**
* Clone a text node to the result tree
@@ -1523,7 +1523,7 @@
problem(
const XalanDOMString& msg,
ProblemListener::eClassification classification,
- const LocatorType& locator,
+ const Locator& locator,
const XalanNode* sourceNode) const;
void
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp Tue Oct 21 09:34:02 2008
@@ -101,7 +101,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) const = 0;
+ const Locator* locator) const = 0;
virtual void
reset() = 0;
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp Tue Oct 21 09:34:02 2008
@@ -282,7 +282,7 @@
const XalanDOMString& functionName,
XalanNode* context,
const XObjectArgVectorType& argVec,
- const LocatorType* locator) const
+ const Locator* locator) const
{
return m_defaultSupport.extFunction(
executionContext,
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp Tue Oct 21 09:34:02 2008
@@ -168,7 +168,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/XSLT/XalanAVTAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.cpp Tue Oct 21 09:34:02 2008
@@ -41,7 +41,7 @@
XalanAVTAllocator::data_type*
XalanAVTAllocator::create(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver)
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanAVTAllocator.hpp Tue Oct 21 09:34:02 2008
@@ -77,7 +77,7 @@
data_type*
create(
StylesheetConstructionContext& constructionContext,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar* name,
const XalanDOMChar* stringedValue,
const PrefixResolver& resolver);
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.cpp Tue Oct 21 09:34:02 2008
@@ -58,7 +58,7 @@
StylesheetConstructionContext& theConstructionContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator) :
+ const Locator* theLocator) :
NodeTester(),
m_matchScore(XPath::eMatchScoreNone),
m_type(theType)
Modified: xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XalanSpaceNodeTester.hpp Tue Oct 21 09:34:02 2008
@@ -59,7 +59,7 @@
StylesheetConstructionContext& theContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
- const LocatorType* theLocator);
+ const Locator* theLocator);
~XalanSpaceNodeTester();
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommon.cpp Tue Oct 21 09:34:02 2008
@@ -136,7 +136,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
// Make sure nothing's happened to our strings and that
// they were actually initialized...
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp Tue Oct 21 09:34:02 2008
@@ -142,7 +142,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp Tue Oct 21 09:34:02 2008
@@ -166,7 +166,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 0)
{
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp Tue Oct 21 09:34:02 2008
@@ -54,7 +54,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamic.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamic.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamic.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamic.cpp Tue Oct 21 09:34:02 2008
@@ -38,7 +38,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
try
{
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp Tue Oct 21 09:34:02 2008
@@ -63,7 +63,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMath.cpp Tue Oct 21 09:34:02 2008
@@ -128,7 +128,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -176,7 +176,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -278,7 +278,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -324,7 +324,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -370,7 +370,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -416,7 +416,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.empty() == false)
{
@@ -472,7 +472,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -521,7 +521,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -569,7 +569,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -618,7 +618,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
@@ -1029,7 +1029,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
@@ -1127,7 +1127,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -1174,7 +1174,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -1221,7 +1221,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -1270,7 +1270,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
@@ -1320,7 +1320,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -1369,7 +1369,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -1416,7 +1416,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp Tue Oct 21 09:34:02 2008
@@ -58,7 +58,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -111,7 +111,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -164,7 +164,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -217,7 +217,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -270,7 +270,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -323,7 +323,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -376,7 +376,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -452,7 +452,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -505,7 +505,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -558,7 +558,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -611,7 +611,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -664,7 +664,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -717,7 +717,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -770,7 +770,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -823,7 +823,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -876,7 +876,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -929,7 +929,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -982,7 +982,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSet.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSet.cpp Tue Oct 21 09:34:02 2008
@@ -38,7 +38,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
@@ -159,7 +159,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
@@ -203,7 +203,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 2)
{
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp Tue Oct 21 09:34:02 2008
@@ -160,7 +160,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -269,7 +269,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -329,7 +329,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- 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