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 [3/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/XalanEXSLT/XalanEXSLTString.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp Tue Oct 21 09:34:02 2008
@@ -69,7 +69,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
const XObjectArgVectorType::size_type theSize = args.size();
@@ -176,7 +176,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
if (args.size() != 1)
{
@@ -227,7 +227,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
assert(m_space == s_spaceString);
@@ -336,7 +336,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
const XObjectArgVectorType::size_type theSize = args.size();
@@ -470,7 +470,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const
+ const Locator* locator) const
{
const XObjectArgVectorType::size_type theSize = args.size();
@@ -609,7 +609,7 @@
XalanEXSLTFunctionDecodeURI::hexCharsToByte(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar highHexChar,
const XalanDOMChar lowHexChar) const
{
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp Tue Oct 21 09:34:02 2008
@@ -59,7 +59,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -124,7 +124,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -202,7 +202,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;
@@ -340,7 +340,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectArgVectorType& args,
- const LocatorType* locator) const;
+ const Locator* locator) const;
using ParentType::execute;
@@ -370,7 +370,7 @@
hexCharsToByte(
XPathExecutionContext& executionContext,
XalanNode* context,
- const LocatorType* locator,
+ const Locator* locator,
const XalanDOMChar highHexChar,
const XalanDOMChar lowHexChar) const;
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,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/XalanExtensions/FunctionDifference.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.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;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp Tue Oct 21 09:34:02 2008
@@ -62,7 +62,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/XalanExtensions/FunctionDistinct.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.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;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp Tue Oct 21 09:34:02 2008
@@ -62,7 +62,7 @@
XalanNode* context,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Function::LocatorType* locator)
+ const Locator* locator)
{
// $$$ ToDo: Consider moving all of this into a member function of
// XPathExecutionContext.
@@ -90,7 +90,7 @@
XalanNode* context,
const XalanDOMString& expression,
const XalanNode* resolver,
- const Function::LocatorType* locator)
+ const Locator* locator)
{
assert(resolver == 0 || resolver->getNodeType() == XalanNode::ELEMENT_NODE);
@@ -107,7 +107,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/XalanExtensions/FunctionEvaluate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp Tue Oct 21 09:34:02 2008
@@ -57,7 +57,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/XalanExtensions/FunctionHasSameNodes.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,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/XalanExtensions/FunctionHasSameNodes.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.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;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.cpp Tue Oct 21 09:34:02 2008
@@ -49,7 +49,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/XalanExtensions/FunctionIntersection.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.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;
using ParentType::execute;
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.cpp Tue Oct 21 09:34:02 2008
@@ -131,7 +131,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/XalanExtensions/FunctionNodeSet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp Tue Oct 21 09:34:02 2008
@@ -64,7 +64,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/XalanSourceTree/FormatterToSourceTree.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp Tue Oct 21 09:34:02 2008
@@ -93,7 +93,7 @@
void
-FormatterToSourceTree::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToSourceTree::setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp Tue Oct 21 09:34:02 2008
@@ -158,7 +158,7 @@
entityReference(const XMLCh* const name);
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp Tue Oct 21 09:34:02 2008
@@ -238,7 +238,7 @@
void
-XalanSourceTreeContentHandler::setDocumentLocator(const LocatorType* const /* locator */)
+XalanSourceTreeContentHandler::setDocumentLocator(const Locator* const /* locator */)
{
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp Tue Oct 21 09:34:02 2008
@@ -53,6 +53,10 @@
+XALAN_USING_XERCES(Locator)
+
+
+
typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes AttributesType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList AttributeListType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER ContentHandler ContentHandlerType;
@@ -119,7 +123,7 @@
const XMLCh* const data);
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.cpp Tue Oct 21 09:34:02 2008
@@ -126,7 +126,7 @@
void
-FormatterToDeprecatedXercesDOM::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToDeprecatedXercesDOM::setDocumentLocator(const Locator* const /* locator */)
{
// No action for the moment.
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp Tue Oct 21 09:34:02 2008
@@ -128,7 +128,7 @@
entityReference(const XMLCh* const name);
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp Tue Oct 21 09:34:02 2008
@@ -106,7 +106,7 @@
void
-FormatterToXercesDOM::setDocumentLocator(const LocatorType* const /* locator */)
+FormatterToXercesDOM::setDocumentLocator(const Locator* const /* locator */)
{
// No action for the moment.
}
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp?rev=706680&r1=706679&r2=706680&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp Tue Oct 21 09:34:02 2008
@@ -103,7 +103,7 @@
entityReference(const XMLCh* const name);
virtual void
- setDocumentLocator(const LocatorType* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org