dbertoni 2002/11/20 17:26:26
Modified: c/src/XPath ElementPrefixResolverProxy.cpp
ElementPrefixResolverProxy.hpp
FormatterStringLengthCounter.cpp
FormatterStringLengthCounter.hpp FoundIndex.cpp
FoundIndex.hpp Function.cpp Function.hpp
FunctionBoolean.cpp FunctionBoolean.hpp
FunctionCeiling.cpp FunctionCeiling.hpp
FunctionConcat.cpp FunctionConcat.hpp
FunctionContains.cpp FunctionContains.hpp
FunctionCount.cpp FunctionCount.hpp
FunctionFalse.cpp FunctionFalse.hpp
FunctionFloor.cpp FunctionFloor.hpp FunctionID.cpp
FunctionID.hpp FunctionLang.cpp FunctionLang.hpp
FunctionLast.cpp FunctionLast.hpp
FunctionLocalName.cpp FunctionLocalName.hpp
FunctionName.cpp FunctionName.hpp
FunctionNamespaceURI.cpp FunctionNamespaceURI.hpp
FunctionNormalizeSpace.cpp
FunctionNormalizeSpace.hpp FunctionNot.cpp
FunctionNot.hpp FunctionNumber.cpp
FunctionNumber.hpp FunctionPosition.cpp
FunctionPosition.hpp FunctionRound.cpp
FunctionRound.hpp FunctionStartsWith.cpp
FunctionStartsWith.hpp FunctionString.cpp
FunctionString.hpp FunctionStringLength.cpp
FunctionStringLength.hpp FunctionSubstring.cpp
FunctionSubstring.hpp FunctionSubstringAfter.cpp
FunctionSubstringAfter.hpp
FunctionSubstringBefore.cpp
FunctionSubstringBefore.hpp FunctionSum.cpp
FunctionSum.hpp FunctionTranslate.cpp
FunctionTranslate.hpp FunctionTrue.cpp
FunctionTrue.hpp MutableNodeRefList.cpp
MutableNodeRefList.hpp NameSpace.hpp
NodeRefList.cpp NodeRefList.hpp NodeRefListBase.cpp
NodeRefListBase.hpp ResultTreeFragBase.cpp
ResultTreeFragBase.hpp XBoolean.cpp XBoolean.hpp
XNodeSet.cpp XNodeSet.hpp XNodeSetAllocator.cpp
XNodeSetAllocator.hpp XNodeSetBase.cpp
XNodeSetBase.hpp XNodeSetResultTreeFragProxy.cpp
XNodeSetResultTreeFragProxy.hpp XNull.cpp XNull.hpp
XNumber.cpp XNumber.hpp XNumberAllocator.cpp
XNumberAllocator.hpp XNumberBase.cpp
XNumberBase.hpp XObject.cpp XObject.hpp
XObjectFactory.cpp XObjectFactory.hpp
XObjectFactoryDefault.cpp XObjectFactoryDefault.hpp
XObjectResultTreeFragProxy.cpp
XObjectResultTreeFragProxy.hpp
XObjectResultTreeFragProxyBase.cpp
XObjectResultTreeFragProxyBase.hpp
XObjectResultTreeFragProxyText.cpp
XObjectResultTreeFragProxyText.hpp
XObjectTypeCallback.cpp XObjectTypeCallback.hpp
XPath.cpp XPath.hpp XPathAllocator.cpp
XPathAllocator.hpp XPathConstructionContext.cpp
XPathConstructionContext.hpp
XPathConstructionContextDefault.cpp
XPathConstructionContextDefault.hpp
XPathDefinitions.hpp XPathEnvSupport.cpp
XPathEnvSupport.hpp XPathEnvSupportDefault.cpp
XPathEnvSupportDefault.hpp XPathEvaluator.cpp
XPathEvaluator.hpp XPathExecutionContext.cpp
XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
XPathExpression.cpp XPathExpression.hpp
XPathFactory.cpp XPathFactory.hpp
XPathFactoryBlock.cpp XPathFactoryBlock.hpp
XPathFactoryDefault.cpp XPathFactoryDefault.hpp
XPathFunctionTable.cpp XPathFunctionTable.hpp
XPathInit.cpp XPathInit.hpp
XPathParserException.cpp XPathParserException.hpp
XPathProcessor.cpp XPathProcessor.hpp
XPathProcessorImpl.cpp XPathProcessorImpl.hpp
XSpan.cpp XSpan.hpp XString.cpp XString.hpp
XStringAdapter.cpp XStringAdapter.hpp
XStringAdapterAllocator.cpp
XStringAdapterAllocator.hpp XStringAllocator.cpp
XStringAllocator.hpp XStringBase.cpp
XStringBase.hpp XStringCached.cpp XStringCached.hpp
XStringCachedAllocator.cpp
XStringCachedAllocator.hpp XStringReference.cpp
XStringReference.hpp XStringReferenceAllocator.cpp
XStringReferenceAllocator.hpp XToken.cpp XToken.hpp
XTokenNumberAdapter.cpp XTokenNumberAdapter.hpp
XTokenNumberAdapterAllocator.cpp
XTokenNumberAdapterAllocator.hpp
XTokenStringAdapter.cpp XTokenStringAdapter.hpp
XTokenStringAdapterAllocator.cpp
XTokenStringAdapterAllocator.hpp XUnknown.cpp
XUnknown.hpp XalanQName.cpp XalanQName.hpp
XalanQNameByReference.cpp XalanQNameByReference.hpp
XalanQNameByValue.cpp XalanQNameByValue.hpp
XalanQNameByValueAllocator.cpp
XalanQNameByValueAllocator.hpp
XalanXPathException.cpp XalanXPathException.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.9 +9 -1 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp
Index: ElementPrefixResolverProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElementPrefixResolverProxy.cpp 28 Mar 2002 04:17:09 -0000 1.8
+++ ElementPrefixResolverProxy.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ElementPrefixResolverProxy::ElementPrefixResolverProxy(
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
@@ -135,3 +139,7 @@
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +9 -1 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp
Index: ElementPrefixResolverProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElementPrefixResolverProxy.hpp 26 Oct 2002 01:07:55 -0000 1.11
+++ ElementPrefixResolverProxy.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
class XPathEnvSupport;
class XalanElement;
@@ -127,6 +131,10 @@
mutable XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +11 -3 xml-xalan/c/src/XPath/FormatterStringLengthCounter.cpp
Index: FormatterStringLengthCounter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FormatterStringLengthCounter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormatterStringLengthCounter.cpp 4 Oct 2002 08:23:57 -0000 1.2
+++ FormatterStringLengthCounter.cpp 21 Nov 2002 01:26:17 -0000 1.3
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FormatterStringLengthCounter::FormatterStringLengthCounter() :
FormatterListener(OUTPUT_METHOD_NONE),
m_count(0)
@@ -74,7 +78,7 @@
void
-FormatterStringLengthCounter::setDocumentLocator(const Locator* const
/* locator */)
+FormatterStringLengthCounter::setDocumentLocator(const LocatorType* const
/* locator */)
{
}
@@ -96,8 +100,8 @@
void
FormatterStringLengthCounter::startElement(
- const XMLCh* const /* name */,
- AttributeList& /* attrs */)
+ const XMLCh* const /* name */,
+ AttributeListType& /* attrs */)
{
}
@@ -174,3 +178,7 @@
const unsigned int /* length */)
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -6 xml-xalan/c/src/XPath/FormatterStringLengthCounter.hpp
Index: FormatterStringLengthCounter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FormatterStringLengthCounter.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormatterStringLengthCounter.hpp 4 Oct 2002 06:57:27 -0000 1.1
+++ FormatterStringLengthCounter.hpp 21 Nov 2002 01:26:17 -0000 1.2
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This class takes SAX events (in addition to some extra events
* that SAX doesn't handle yet) and produces counts the characters
@@ -78,6 +82,8 @@
{
public:
+ typedef unsigned long size_type;
+
/**
* FormatterStringLengthCounter instance constructor.
*/
@@ -88,7 +94,7 @@
~FormatterStringLengthCounter();
- double
+ unsigned long
getCount() const
{
return m_count;
@@ -97,7 +103,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(const Locator* const locator);
+ setDocumentLocator(const LocatorType* const locator);
virtual void
startDocument();
@@ -107,8 +113,8 @@
virtual void
startElement(
- const XMLCh* const name,
- AttributeList& attrs);
+ const XMLCh* const name,
+ AttributeListType& attrs);
virtual void
endElement(const XMLCh* const name);
@@ -136,7 +142,6 @@
const XMLCh* const target,
const XMLCh* const data);
-
virtual void
resetDocument();
@@ -160,8 +165,12 @@
operator==(const FormatterStringLengthCounter&) const;
// Data members...
- double m_count;
+ size_type m_count;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XPath/FoundIndex.cpp
Index: FoundIndex.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FoundIndex.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FoundIndex.cpp 4 Jan 2002 17:29:07 -0000 1.2
+++ FoundIndex.cpp 21 Nov 2002 01:26:17 -0000 1.3
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FoundIndex::FoundIndex() :
XalanXPathException()
{
@@ -69,3 +73,7 @@
FoundIndex::~FoundIndex()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/XPath/FoundIndex.hpp
Index: FoundIndex.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FoundIndex.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FoundIndex.hpp 4 Jan 2002 17:29:07 -0000 1.2
+++ FoundIndex.hpp 21 Nov 2002 01:26:17 -0000 1.3
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT FoundIndex : public XalanXPathException
{
public:
@@ -78,6 +82,10 @@
virtual
~FoundIndex();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +14 -6 xml-xalan/c/src/XPath/Function.cpp
Index: Function.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/Function.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Function.cpp 16 Apr 2002 03:08:43 -0000 1.6
+++ Function.cpp 21 Nov 2002 01:26:17 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
Function::Function()
{
}
@@ -81,7 +85,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
const XObjectArgVectorType::size_type theArgCount = args.size();
@@ -115,7 +119,7 @@
Function::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
executionContext.error(getError(), context, locator);
@@ -129,7 +133,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr /* arg1 */,
- const Locator* locator) const
+ const LocatorType* locator) const
{
executionContext.error(getError(), context, locator);
@@ -144,7 +148,7 @@
XalanNode* context,
const XObjectPtr /* arg1 */,
const XObjectPtr /* arg2 */,
- const Locator* locator) const
+ const LocatorType* locator) const
{
executionContext.error(getError(), context, locator);
@@ -160,9 +164,13 @@
const XObjectPtr /* arg1 */,
const XObjectPtr /* arg2 */,
const XObjectPtr /* arg3 */,
- const Locator* locator) const
+ const LocatorType* locator) const
{
executionContext.error(getError(), context, locator);
return XObjectPtr(0);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +25 -12 xml-xalan/c/src/XPath/Function.hpp
Index: Function.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/Function.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Function.hpp 17 Apr 2002 05:32:58 -0000 1.12
+++ Function.hpp 21 Nov 2002 01:26:17 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,14 @@
-class Locator;
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -87,6 +94,8 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
explicit
Function();
@@ -106,7 +115,7 @@
* @param executionContext executing context
* @param context current context node
* @param args vector of pointers to XObject arguments
- * @param locator Locator for the XPath expression
that contains the function call
+ * @param locator LocatorType instance for the XPath
expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -114,7 +123,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -122,14 +131,14 @@
*
* @param executionContext executing context
* @param context current context node
- * @param locator Locator for the XPath expression
that contains the function call
+ * @param locator LocatorType instance for the XPath
expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -138,7 +147,7 @@
* @param executionContext executing context
* @param context current context node
* @param arg pointer to XObject argument
- * @param locator Locator for the XPath expression
that contains the function call
+ * @param locator LocatorType instance for the XPath
expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -146,7 +155,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -156,7 +165,7 @@
* @param context current context node
* @param arg1 pointer to XObject argument
* @param arg2 pointer to XObject argument
- * @param locator Locator for the XPath expression
that contains the function call
+ * @param locator LocatorType instance for the XPath
expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -165,7 +174,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
/**
* Execute an XPath function object. The function must return a valid
@@ -176,7 +185,7 @@
* @param arg1 pointer to XObject arguments
* @param arg2 pointer to XObject argument
* @param arg3 pointer to XObject argument
- * @param locator Locator for the XPath expression
that contains the function call
+ * @param locator LocatorType instance for the XPath
expression that contains the function call
* @return pointer to the result XObject
*/
virtual XObjectPtr
@@ -186,7 +195,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const;
+ const LocatorType* locator) const;
/**
* Create a copy of the function object.
@@ -217,6 +226,10 @@
bool
operator==(const Function&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionBoolean.cpp
Index: FunctionBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionBoolean.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionBoolean.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionBoolean.cpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionBoolean::FunctionBoolean()
{
}
@@ -79,7 +83,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -105,3 +109,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The boolean()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionBoolean.hpp
Index: FunctionBoolean.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionBoolean.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionBoolean.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionBoolean.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "boolean" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionBoolean&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionCeiling.cpp
Index: FunctionCeiling.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCeiling.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionCeiling.cpp 11 Apr 2002 05:53:43 -0000 1.8
+++ FunctionCeiling.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionCeiling::FunctionCeiling()
{
}
@@ -79,7 +83,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -109,3 +113,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The ceiling()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionCeiling.hpp
Index: FunctionCeiling.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCeiling.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionCeiling.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionCeiling.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "ceiling" function.
*/
@@ -92,7 +96,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -115,6 +119,10 @@
bool
operator==(const FunctionCeiling&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +12 -4 xml-xalan/c/src/XPath/FunctionConcat.cpp
Index: FunctionConcat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionConcat.cpp 11 Oct 2002 01:57:24 -0000 1.13
+++ FunctionConcat.cpp 21 Nov 2002 01:26:17 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionConcat::FunctionConcat()
{
}
@@ -80,7 +84,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -103,7 +107,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() ==
false);
@@ -125,7 +129,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
/* context */,
const XObjectArgVectorType& args,
- const Locator* /*
locator */) const
+ const LocatorType* /*
locator */) const
{
const XObjectArgVectorType::const_iterator theEnd = args.end();
@@ -162,3 +166,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The concat()
function takes at least two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +12 -4 xml-xalan/c/src/XPath/FunctionConcat.hpp
Index: FunctionConcat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionConcat.hpp 14 Sep 2001 20:06:26 -0000 1.9
+++ FunctionConcat.hpp 21 Nov 2002 01:26:17 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "concat" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
XObjectPtr
execute(
@@ -96,7 +100,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
XObjectPtr
execute(
@@ -105,7 +109,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -128,6 +132,10 @@
bool
operator==(const FunctionConcat&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionContains.cpp
Index: FunctionContains.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionContains.cpp 26 Sep 2001 20:58:46 -0000 1.8
+++ FunctionContains.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionContains::FunctionContains()
{
}
@@ -80,7 +84,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -129,3 +133,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
contains() function takes two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionContains.hpp
Index: FunctionContains.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionContains.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionContains.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "contains" function.
*/
@@ -89,7 +93,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -112,6 +116,10 @@
bool
operator==(const FunctionContains&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionCount.cpp
Index: FunctionCount.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCount.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionCount.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionCount.cpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionCount::FunctionCount()
{
}
@@ -79,7 +83,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -107,3 +111,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The count()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 xml-xalan/c/src/XPath/FunctionCount.hpp
Index: FunctionCount.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCount.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionCount.hpp 14 Sep 2001 20:06:26 -0000 1.9
+++ FunctionCount.hpp 21 Nov 2002 01:26:17 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "count" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionCount&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionFalse.cpp
Index: FunctionFalse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFalse.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionFalse.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionFalse.cpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionFalse::FunctionFalse()
{
}
@@ -78,7 +82,7 @@
FunctionFalse::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
return executionContext.getXObjectFactory().createBoolean(false);
}
@@ -102,3 +106,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The false()
function does not accept arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionFalse.hpp
Index: FunctionFalse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFalse.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionFalse.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionFalse.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "false" function.
*/
@@ -87,7 +91,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -110,6 +114,10 @@
bool
operator==(const FunctionFalse&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionFloor.cpp
Index: FunctionFloor.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFloor.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionFloor.cpp 11 Apr 2002 05:53:43 -0000 1.8
+++ FunctionFloor.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionFloor::FunctionFloor()
{
}
@@ -79,7 +83,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -109,3 +113,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The floor()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionFloor.hpp
Index: FunctionFloor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFloor.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionFloor.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionFloor.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "floor" function.
*/
@@ -92,7 +96,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -115,6 +119,10 @@
bool
operator==(const FunctionFloor&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +11 -3 xml-xalan/c/src/XPath/FunctionID.cpp
Index: FunctionID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionID.cpp 26 Sep 2001 20:58:46 -0000 1.10
+++ FunctionID.cpp 21 Nov 2002 01:26:17 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionID::FunctionID()
{
}
@@ -83,7 +87,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false);
@@ -127,7 +131,7 @@
}
else if (length(theResultString) > 0)
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef set<XalanDOMString, less<XalanDOMString> >
TokenSetType;
#else
typedef std::set<XalanDOMString> TokenSetType;
@@ -294,3 +298,7 @@
FunctionID::FunctionIDXObjectTypeCallback::Null(const XObject&
/* theObject */)
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.22 +10 -2 xml-xalan/c/src/XPath/FunctionID.hpp
Index: FunctionID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FunctionID.hpp 14 Sep 2001 20:06:26 -0000 1.21
+++ FunctionID.hpp 21 Nov 2002 01:26:17 -0000 1.22
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "id" function.
*/
@@ -109,7 +113,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -188,6 +192,10 @@
bool
operator==(const FunctionID&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionLang.cpp
Index: FunctionLang.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionLang.cpp 23 Jan 2002 00:00:37 -0000 1.11
+++ FunctionLang.cpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionLang::FunctionLang() :
m_attributeName(XALAN_STATIC_UCODE_STRING("lang"))
{
@@ -84,7 +88,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -150,3 +154,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The lang()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -2 xml-xalan/c/src/XPath/FunctionLang.hpp
Index: FunctionLang.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionLang.hpp 14 Sep 2001 20:06:26 -0000 1.14
+++ FunctionLang.hpp 21 Nov 2002 01:26:17 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "lang" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -113,6 +117,10 @@
const XalanDOMString m_attributeName;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionLast.cpp
Index: FunctionLast.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionLast.cpp 26 Sep 2001 20:58:46 -0000 1.8
+++ FunctionLast.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionLast::FunctionLast()
{
}
@@ -78,7 +82,7 @@
FunctionLast::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
const NodeRefListBase::size_type theValue =
executionContext.getContextNodeListLength();
@@ -104,3 +108,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The last()
function does not accept any arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionLast.hpp
Index: FunctionLast.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionLast.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionLast.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "last" function.
*/
@@ -88,7 +92,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionLast&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +10 -3 xml-xalan/c/src/XPath/FunctionLocalName.cpp
Index: FunctionLocalName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLocalName.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionLocalName.cpp 20 Sep 2001 18:05:34 -0000 1.12
+++ FunctionLocalName.cpp 21 Nov 2002 01:26:17 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionLocalName::FunctionLocalName()
{
}
@@ -86,7 +90,7 @@
FunctionLocalName::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -110,7 +114,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -182,3 +186,6 @@
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
local-name() function takes zero or one arguments!"));
}
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +11 -3 xml-xalan/c/src/XPath/FunctionLocalName.hpp
Index: FunctionLocalName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLocalName.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionLocalName.hpp 14 Sep 2001 20:06:26 -0000 1.14
+++ FunctionLocalName.hpp 21 Nov 2002 01:26:17 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "local-name" function.
*/
@@ -99,14 +103,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -134,6 +138,10 @@
bool
operator==(const FunctionLocalName&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +11 -3 xml-xalan/c/src/XPath/FunctionName.cpp
Index: FunctionName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionName.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionName.cpp 20 Sep 2001 18:05:34 -0000 1.10
+++ FunctionName.cpp 21 Nov 2002 01:26:17 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionName::FunctionName()
{
}
@@ -82,7 +86,7 @@
FunctionName::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -107,7 +111,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -146,3 +150,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The name()
function takes zero or one arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/XPath/FunctionName.hpp
Index: FunctionName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionName.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionName.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionName.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "name" function.
*/
@@ -103,14 +107,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -133,6 +137,10 @@
bool
operator==(const FunctionName&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +11 -3 xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp
Index: FunctionNamespaceURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionNamespaceURI.cpp 20 Sep 2001 18:05:34 -0000 1.13
+++ FunctionNamespaceURI.cpp 21 Nov 2002 01:26:17 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionNamespaceURI::FunctionNamespaceURI()
{
}
@@ -90,7 +94,7 @@
FunctionNamespaceURI::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -115,7 +119,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false);
@@ -152,3 +156,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
namespace-uri() function takes zero arguments or one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +11 -3 xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp
Index: FunctionNamespaceURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionNamespaceURI.hpp 14 Sep 2001 20:06:26 -0000 1.14
+++ FunctionNamespaceURI.hpp 21 Nov 2002 01:26:17 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "namespace-uri" function.
*/
@@ -95,14 +99,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -125,6 +129,10 @@
bool
operator==(const FunctionNamespaceURI&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.16 +11 -3 xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp
Index: FunctionNormalizeSpace.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionNormalizeSpace.cpp 26 Sep 2001 20:58:46 -0000 1.15
+++ FunctionNormalizeSpace.cpp 21 Nov 2002 01:26:17 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionNormalizeSpace::FunctionNormalizeSpace()
{
}
@@ -83,7 +87,7 @@
FunctionNormalizeSpace::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -119,7 +123,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -275,3 +279,7 @@
return fNormalize;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +11 -3 xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp
Index: FunctionNormalizeSpace.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionNormalizeSpace.hpp 14 Sep 2001 20:06:26 -0000 1.7
+++ FunctionNormalizeSpace.hpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "normalize-space" function.
*/
@@ -91,14 +95,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -134,6 +138,10 @@
bool
operator==(const FunctionNormalizeSpace&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionNot.cpp
Index: FunctionNot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNot.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionNot.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionNot.cpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionNot::FunctionNot()
{
}
@@ -79,7 +83,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -105,3 +109,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The not()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionNot.hpp
Index: FunctionNot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNot.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionNot.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionNot.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "not" function.
*/
@@ -88,7 +92,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -111,6 +115,10 @@
bool
operator==(const FunctionNot&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +11 -3 xml-xalan/c/src/XPath/FunctionNumber.cpp
Index: FunctionNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNumber.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionNumber.cpp 20 Sep 2001 18:05:34 -0000 1.8
+++ FunctionNumber.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionNumber::FunctionNumber()
{
}
@@ -82,7 +86,7 @@
FunctionNumber::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -120,7 +124,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -155,3 +159,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The number()
function takes zero or one arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/XPath/FunctionNumber.hpp
Index: FunctionNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNumber.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionNumber.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionNumber.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "number" function.
*/
@@ -91,14 +95,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -121,6 +125,10 @@
bool
operator==(const FunctionNumber&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionPosition.cpp
Index: FunctionPosition.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionPosition.cpp 26 Sep 2001 20:58:46 -0000 1.8
+++ FunctionPosition.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionPosition::FunctionPosition()
{
}
@@ -78,7 +82,7 @@
FunctionPosition::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -116,3 +120,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
position() function does not accept any arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionPosition.hpp
Index: FunctionPosition.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionPosition.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionPosition.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "position" function.
*/
@@ -87,7 +91,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -110,6 +114,10 @@
bool
operator==(const FunctionPosition&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionRound.cpp
Index: FunctionRound.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionRound.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionRound.cpp 20 Sep 2001 18:05:34 -0000 1.8
+++ FunctionRound.cpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionRound::FunctionRound()
{
}
@@ -83,7 +87,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -109,3 +113,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The round()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionRound.hpp
Index: FunctionRound.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionRound.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionRound.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionRound.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "round" function.
*/
@@ -92,7 +96,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -115,6 +119,10 @@
bool
operator==(const FunctionRound&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionStartsWith.cpp
Index: FunctionStartsWith.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionStartsWith.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionStartsWith.cpp 21 Nov 2002 01:26:17 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionStartsWith::FunctionStartsWith()
{
}
@@ -80,7 +84,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -108,3 +112,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
starts-with() function takes two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +10 -2 xml-xalan/c/src/XPath/FunctionStartsWith.hpp
Index: FunctionStartsWith.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionStartsWith.hpp 14 Sep 2001 20:06:26 -0000 1.8
+++ FunctionStartsWith.hpp 21 Nov 2002 01:26:17 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "starts-with" function.
*/
@@ -89,7 +93,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -112,6 +116,10 @@
bool
operator==(const FunctionStartsWith&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/XPath/FunctionString.cpp
Index: FunctionString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionString.cpp 20 Sep 2001 18:05:34 -0000 1.11
+++ FunctionString.cpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionString::FunctionString()
{
}
@@ -82,7 +86,7 @@
FunctionString::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -120,7 +124,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -155,3 +159,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The string()
function takes zero or one arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +11 -3 xml-xalan/c/src/XPath/FunctionString.hpp
Index: FunctionString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionString.hpp 14 Sep 2001 20:06:26 -0000 1.12
+++ FunctionString.hpp 21 Nov 2002 01:26:17 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "string" function.
*/
@@ -95,14 +99,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -125,6 +129,10 @@
bool
operator==(const FunctionString&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -2 xml-xalan/c/src/XPath/FunctionStringLength.cpp
Index: FunctionStringLength.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionStringLength.cpp 4 Oct 2002 06:58:07 -0000 1.9
+++ FunctionStringLength.cpp 21 Nov 2002 01:26:17 -0000 1.10
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionStringLength::FunctionStringLength()
{
}
@@ -82,7 +86,7 @@
FunctionStringLength::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const
+ const LocatorType* locator) const
{
if (context == 0)
{
@@ -120,7 +124,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg.null() == false);
@@ -146,3 +150,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
string-length() function takes zero or one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/XPath/FunctionStringLength.hpp
Index: FunctionStringLength.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionStringLength.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionStringLength.hpp 21 Nov 2002 01:26:17 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "string-length" function.
*/
@@ -91,14 +95,14 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -121,6 +125,10 @@
bool
operator==(const FunctionStringLength&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.20 +11 -3 xml-xalan/c/src/XPath/FunctionSubstring.cpp
Index: FunctionSubstring.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FunctionSubstring.cpp 26 Apr 2002 06:52:34 -0000 1.19
+++ FunctionSubstring.cpp 21 Nov 2002 01:26:18 -0000 1.20
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XObjectPtr FunctionSubstring::s_nullXObjectPtr;
@@ -187,7 +191,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -203,7 +207,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -282,3 +286,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring() function takes two or three arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/XPath/FunctionSubstring.hpp
Index: FunctionSubstring.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSubstring.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionSubstring.hpp 21 Nov 2002 01:26:18 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "substring" function.
*/
@@ -101,7 +105,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
virtual XObjectPtr
execute(
@@ -110,7 +114,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -135,6 +139,10 @@
static const XObjectPtr s_nullXObjectPtr;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +10 -2 xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp
Index: FunctionSubstringAfter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionSubstringAfter.cpp 26 Sep 2001 20:58:46 -0000 1.13
+++ FunctionSubstringAfter.cpp 21 Nov 2002 01:26:18 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionSubstringAfter::FunctionSubstringAfter()
{
}
@@ -80,7 +84,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -150,3 +154,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring-after() function takes two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp
Index: FunctionSubstringAfter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionSubstringAfter.hpp 14 Sep 2001 20:06:26 -0000 1.10
+++ FunctionSubstringAfter.hpp 21 Nov 2002 01:26:18 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "substring-after" function.
*/
@@ -89,7 +93,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -112,6 +116,10 @@
bool
operator==(const FunctionSubstringAfter&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +10 -2 xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp
Index: FunctionSubstringBefore.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionSubstringBefore.cpp 26 Sep 2001 20:58:46 -0000 1.13
+++ FunctionSubstringBefore.cpp 21 Nov 2002 01:26:18 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionSubstringBefore::FunctionSubstringBefore()
{
}
@@ -80,7 +84,7 @@
XalanNode* /* context */,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false);
@@ -139,3 +143,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
substring-before() function takes two arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp
Index: FunctionSubstringBefore.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionSubstringBefore.hpp 14 Sep 2001 20:06:26 -0000 1.10
+++ FunctionSubstringBefore.hpp 21 Nov 2002 01:26:18 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "substring-before" function.
*/
@@ -89,7 +93,7 @@
XalanNode* context,
const XObjectPtr arg1,
const XObjectPtr arg2,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -112,6 +116,10 @@
bool
operator==(const FunctionSubstringBefore&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionSum.cpp
Index: FunctionSum.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSum.cpp 11 Apr 2002 05:53:43 -0000 1.11
+++ FunctionSum.cpp 21 Nov 2002 01:26:18 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionSum::FunctionSum()
{
}
@@ -83,7 +87,7 @@
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false);
@@ -128,3 +132,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The sum()
function takes one argument!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionSum.hpp
Index: FunctionSum.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSum.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionSum.hpp 21 Nov 2002 01:26:18 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "sum" function.
*/
@@ -93,7 +97,7 @@
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -116,6 +120,10 @@
bool
operator==(const FunctionSum&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +11 -3 xml-xalan/c/src/XPath/FunctionTranslate.cpp
Index: FunctionTranslate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionTranslate.cpp 26 Sep 2001 20:58:46 -0000 1.13
+++ FunctionTranslate.cpp 21 Nov 2002 01:26:18 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionTranslate::FunctionTranslate()
{
}
@@ -81,7 +85,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
assert(arg1.null() == false && arg2.null() == false && arg3.null() ==
false);
@@ -93,7 +97,7 @@
const XalanDOMString::size_type theSecondStringLength =
length(theSecondString);
const XalanDOMString::size_type theThirdStringLength =
length(theThirdString);
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMChar> VectorType;
#else
typedef std::vector<XalanDOMChar> VectorType;
@@ -159,3 +163,7 @@
{
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The
translate() function takes three arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +10 -2 xml-xalan/c/src/XPath/FunctionTranslate.hpp
Index: FunctionTranslate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionTranslate.hpp 14 Sep 2001 20:06:26 -0000 1.11
+++ FunctionTranslate.hpp 21 Nov 2002 01:26:18 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "translate" function.
*/
@@ -90,7 +94,7 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const XObjectPtr arg3,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -113,6 +117,10 @@
bool
operator==(const FunctionTranslate&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +10 -2 xml-xalan/c/src/XPath/FunctionTrue.cpp
Index: FunctionTrue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTrue.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionTrue.cpp 20 Sep 2001 18:05:34 -0000 1.7
+++ FunctionTrue.cpp 21 Nov 2002 01:26:18 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FunctionTrue::FunctionTrue()
{
}
@@ -78,7 +82,7 @@
FunctionTrue::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
- const Locator* /* locator */) const
+ const LocatorType* /* locator */) const
{
return executionContext.getXObjectFactory().createBoolean(true);
}
@@ -103,3 +107,7 @@
return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The true()
function does not accept arguments!"));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +10 -1 xml-xalan/c/src/XPath/FunctionTrue.hpp
Index: FunctionTrue.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTrue.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionTrue.hpp 5 Aug 2002 15:38:51 -0000 1.9
+++ FunctionTrue.hpp 21 Nov 2002 01:26:18 -0000 1.10
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* XPath implementation of "true" function.
*/
@@ -87,7 +91,7 @@
execute(
XPathExecutionContext& executionContext,
XalanNode* context,
- const Locator* locator) const;
+ const LocatorType* locator) const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
@@ -110,6 +114,11 @@
bool
operator==(const FunctionTrue&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // FUNCTIONTRUE_HEADER_GUARD_1357924680
1.25 +15 -13 xml-xalan/c/src/XPath/MutableNodeRefList.cpp
Index: MutableNodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MutableNodeRefList.cpp 26 Sep 2002 04:05:16 -0000 1.24
+++ MutableNodeRefList.cpp 21 Nov 2002 01:26:18 -0000 1.25
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
MutableNodeRefList::MutableNodeRefList() :
NodeRefList(),
m_order(eUnknownOrder)
@@ -198,9 +202,7 @@
void
MutableNodeRefList::removeNode(const XalanNode* n)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
NodeListVectorType::iterator i =
find(m_nodeList.begin(),
@@ -322,11 +324,9 @@
const MutableNodeRefList& nodelist,
XPathExecutionContext& executionContext)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
- using std::copy;
- using std::for_each;
-#endif
+ XALAN_USING_STD(back_inserter);
+ XALAN_USING_STD(copy);
+ XALAN_USING_STD(for_each);
const eOrder theOtherOrder = nodelist.m_order;
@@ -708,11 +708,9 @@
void
MutableNodeRefList::reverse()
{
-#if defined(XALAN_NO_NAMESPACES)
- ::reverse(
-#else
- std::reverse(
-#endif
+ XALAN_USING_STD(reverse)
+
+ reverse(
m_nodeList.begin(),
m_nodeList.end());
@@ -769,3 +767,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +8 -0 xml-xalan/c/src/XPath/MutableNodeRefList.hpp
Index: MutableNodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MutableNodeRefList.hpp 26 Sep 2002 04:05:16 -0000 1.18
+++ MutableNodeRefList.hpp 21 Nov 2002 01:26:18 -0000 1.19
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPathExecutionContext;
class XalanDocument;
class XalanNodeList;
@@ -361,6 +365,10 @@
eOrder m_order;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XPath/NameSpace.hpp
Index: NameSpace.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NameSpace.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NameSpace.hpp 11 Oct 2002 01:58:31 -0000 1.8
+++ NameSpace.hpp 21 Nov 2002 01:26:18 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* A representation of a namespace. One of these will be pushed on the
* namespace stack for each element.
@@ -207,6 +211,10 @@
XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +15 -8 xml-xalan/c/src/XPath/NodeRefList.cpp
Index: NodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefList.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NodeRefList.cpp 24 Oct 2001 14:10:43 -0000 1.13
+++ NodeRefList.cpp 21 Nov 2002 01:26:18 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
NodeRefList::NodeRefList() :
NodeRefListBase(),
m_nodeList()
@@ -166,15 +170,14 @@
NodeRefList::size_type
NodeRefList::indexOf(const XalanNode* theNode) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
// Look for the node in the list.
NodeListVectorType::const_iterator i =
- find(m_nodeList.begin(),
- m_nodeList.end(),
- theNode);
+ find(
+ m_nodeList.begin(),
+ m_nodeList.end(),
+ theNode);
// If not found, return npos. Otherwise, subtract the iterator
// from the first iterator to get the distance between them.
@@ -187,7 +190,7 @@
bool
NodeRefList::checkForDuplicates() const
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef set<const XalanNode*, less<const XalanNode*> > NodeSetType;
#else
typedef std::set<const XalanNode*> NodeSetType;
@@ -219,3 +222,7 @@
return fResult;
}
#endif
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +10 -2 xml-xalan/c/src/XPath/NodeRefList.hpp
Index: NodeRefList.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefList.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NodeRefList.hpp 27 Jun 2002 05:44:44 -0000 1.16
+++ NodeRefList.hpp 21 Nov 2002 01:26:18 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Local implementation of NodeRefList. This class is for internal use only.
*/
@@ -129,7 +133,7 @@
checkForDuplicates() const;
#endif
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanNode*> NodeListVectorType;
#else
typedef std::vector<XalanNode*> NodeListVectorType;
@@ -159,6 +163,10 @@
NodeListVectorType m_nodeList;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XPath/NodeRefListBase.cpp
Index: NodeRefListBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefListBase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NodeRefListBase.cpp 19 Sep 2002 04:31:24 -0000 1.5
+++ NodeRefListBase.cpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if !defined(XALAN_INLINE_INITIALIZATION)
const NodeRefListBase::size_type NodeRefListBase::npos = ~0u;
#elif !defined(XALAN_INLINE_INITIALIZATION_IS_DEFINITION_BUG)
@@ -76,3 +80,7 @@
NodeRefListBase::~NodeRefListBase()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +9 -1 xml-xalan/c/src/XPath/NodeRefListBase.hpp
Index: NodeRefListBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefListBase.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NodeRefListBase.hpp 14 Nov 2002 17:24:31 -0000 1.14
+++ NodeRefListBase.hpp 21 Nov 2002 01:26:18 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -140,6 +144,10 @@
return *this;
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XPath/ResultTreeFragBase.cpp
Index: ResultTreeFragBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFragBase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultTreeFragBase.cpp 20 Apr 2000 16:29:20 -0000 1.4
+++ ResultTreeFragBase.cpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ResultTreeFragBase::ResultTreeFragBase() :
XalanDocumentFragment()
{
@@ -76,3 +80,7 @@
ResultTreeFragBase::~ResultTreeFragBase()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +9 -1 xml-xalan/c/src/XPath/ResultTreeFragBase.hpp
Index: ResultTreeFragBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFragBase.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ResultTreeFragBase.hpp 23 Feb 2002 03:26:18 -0000 1.14
+++ ResultTreeFragBase.hpp 21 Nov 2002 01:26:18 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class NodeRefListBase;
class XMLParserLiaison;
class XalanDocument;
@@ -218,6 +222,10 @@
return true;
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +8 -0 xml-xalan/c/src/XPath/XBoolean.cpp
Index: XBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XBoolean.cpp 4 Oct 2002 06:58:07 -0000 1.14
+++ XBoolean.cpp 21 Nov 2002 01:26:18 -0000 1.15
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDOMString XBoolean::s_falseString;
XalanDOMString XBoolean::s_trueString;
@@ -197,3 +201,7 @@
releaseMemory(s_falseString);
releaseMemory(s_trueString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +8 -0 xml-xalan/c/src/XPath/XBoolean.hpp
Index: XBoolean.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XBoolean.hpp 4 Oct 2002 06:58:07 -0000 1.11
+++ XBoolean.hpp 21 Nov 2002 01:26:18 -0000 1.12
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XBoolean : public XObject
{
public:
@@ -140,6 +144,10 @@
static XalanDOMString s_trueString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +9 -1 xml-xalan/c/src/XPath/XNodeSet.cpp
Index: XNodeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSet.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XNodeSet.cpp 7 May 2002 03:17:10 -0000 1.29
+++ XNodeSet.cpp 21 Nov 2002 01:26:18 -0000 1.30
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNodeSet::XNodeSet(BorrowReturnMutableNodeRefList& value) :
XNodeSetBase(),
@@ -155,3 +159,7 @@
{
return m_value->getLength();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.23 +9 -1 xml-xalan/c/src/XPath/XNodeSet.hpp
Index: XNodeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSet.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XNodeSet.hpp 26 Sep 2001 20:58:46 -0000 1.22
+++ XNodeSet.hpp 21 Nov 2002 01:26:18 -0000 1.23
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Class to hold XPath return types.
*/
@@ -143,6 +147,10 @@
// Data members...
BorrowReturnMutableNodeRefList m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XNodeSetAllocator.cpp
Index: XNodeSetAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNodeSetAllocator.cpp 30 Nov 2000 19:40:57 -0000 1.2
+++ XNodeSetAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNodeSetAllocator::XNodeSetAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -117,3 +121,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XNodeSetAllocator.hpp
Index: XNodeSetAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNodeSetAllocator.hpp 13 Oct 2000 21:24:02 -0000 1.1
+++ XNodeSetAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XNodeSetAllocator
{
public:
@@ -169,6 +173,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XPath/XNodeSetBase.cpp
Index: XNodeSetBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XNodeSetBase.cpp 4 Oct 2002 23:34:08 -0000 1.6
+++ XNodeSetBase.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const double theBogusNumberValue = 123456789;
@@ -261,3 +265,7 @@
clear(m_cachedStringValue);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XPath/XNodeSetBase.hpp
Index: XNodeSetBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XNodeSetBase.hpp 4 Oct 2002 06:58:07 -0000 1.5
+++ XNodeSetBase.hpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Class to hold XPath return types.
*/
@@ -165,6 +169,10 @@
mutable double m_cachedNumberValue;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.cpp
Index: XNodeSetResultTreeFragProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XNodeSetResultTreeFragProxy.cpp 19 Oct 2001 18:37:47 -0000 1.3
+++ XNodeSetResultTreeFragProxy.cpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNodeSetResultTreeFragProxy::XNodeSetResultTreeFragProxy(const XNodeSetBase&
theValue) :
XObjectResultTreeFragProxyBase(),
m_value(theValue)
@@ -153,3 +157,7 @@
return unsigned(m_value.getLength());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.hpp
Index: XNodeSetResultTreeFragProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetResultTreeFragProxy.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNodeSetResultTreeFragProxy.hpp 1 Nov 2001 15:57:13 -0000 1.4
+++ XNodeSetResultTreeFragProxy.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XNodeSetBase;
@@ -129,6 +133,10 @@
// Data members...
const XNodeSetBase& m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +8 -0 xml-xalan/c/src/XPath/XNull.cpp
Index: XNull.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNull.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XNull.cpp 4 Oct 2002 06:58:07 -0000 1.12
+++ XNull.cpp 21 Nov 2002 01:26:18 -0000 1.13
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNull::XNull() :
XObject(eTypeNull)
{
@@ -157,3 +161,7 @@
{
theCallbackObject.Null(*this);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +8 -0 xml-xalan/c/src/XPath/XNull.hpp
Index: XNull.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNull.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XNull.hpp 4 Oct 2002 06:58:07 -0000 1.12
+++ XNull.hpp 21 Nov 2002 01:26:18 -0000 1.13
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XNull : public XObject
{
public:
@@ -131,6 +135,10 @@
// not implemented
XNull& operator=(const XNull &);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +8 -0 xml-xalan/c/src/XPath/XNumber.cpp
Index: XNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumber.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XNumber.cpp 4 Oct 2002 06:58:07 -0000 1.17
+++ XNumber.cpp 21 Nov 2002 01:26:18 -0000 1.18
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNumber::XNumber(double val) :
XNumberBase(),
m_value(val),
@@ -168,3 +172,7 @@
{
return length(str());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +8 -0 xml-xalan/c/src/XPath/XNumber.hpp
Index: XNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumber.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XNumber.hpp 4 Oct 2002 06:58:07 -0000 1.14
+++ XNumber.hpp 21 Nov 2002 01:26:18 -0000 1.15
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XNumber : public XNumberBase
{
public:
@@ -132,6 +136,10 @@
mutable XalanDOMString m_cachedStringValue;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XNumberAllocator.cpp
Index: XNumberAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberAllocator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNumberAllocator.cpp 30 Nov 2000 19:40:57 -0000 1.2
+++ XNumberAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNumberAllocator::XNumberAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XNumberAllocator.hpp
Index: XNumberAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNumberAllocator.hpp 13 Oct 2000 21:24:02 -0000 1.1
+++ XNumberAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XNumberAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XNumberBase.cpp
Index: XNumberBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XNumberBase.cpp 4 Oct 2002 06:58:07 -0000 1.3
+++ XNumberBase.cpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XNumberBase::XNumberBase() :
XObject(eTypeNumber)
{
@@ -120,3 +124,7 @@
theCallbackObject.Number(*this,
num());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XNumberBase.hpp
Index: XNumberBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XNumberBase.hpp 4 Oct 2002 06:58:07 -0000 1.3
+++ XNumberBase.hpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XNumberBase : public XObject
{
public:
@@ -120,6 +124,10 @@
private:
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +10 -2 xml-xalan/c/src/XPath/XObject.cpp
Index: XObject.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XObject.cpp 11 Apr 2002 05:53:43 -0000 1.29
+++ XObject.cpp 21 Nov 2002 01:26:18 -0000 1.30
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XObject::s_nullString;
@@ -897,7 +901,7 @@
}
else
{
- return ::equals(str(), theRHS.str());
+ return str() == theRHS.str();
}
}
}
@@ -951,7 +955,7 @@
}
else
{
- return !::equals(str(), theRHS.str());
+ return str() != theRHS.str();
}
}
}
@@ -1143,3 +1147,7 @@
toType +
XalanDOMString(XALAN_STATIC_UCODE_STRING("."));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.24 +8 -0 xml-xalan/c/src/XPath/XObject.hpp
Index: XObject.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XObject.hpp 4 Oct 2002 06:58:07 -0000 1.23
+++ XObject.hpp 21 Nov 2002 01:26:18 -0000 1.24
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class MutableNodeRefList;
class NodeRefListBase;
class ResultTreeFragBase;
@@ -525,6 +529,10 @@
{
return theLHS.m_xobjectPtr < theRHS.m_xobjectPtr;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XObjectFactory.cpp
Index: XObjectFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XObjectFactory.cpp 18 Dec 1999 19:47:55 -0000 1.1
+++ XObjectFactory.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XObjectFactory::XObjectFactory()
{
}
@@ -68,3 +72,7 @@
XObjectFactory::~XObjectFactory()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +9 -1 xml-xalan/c/src/XPath/XObjectFactory.hpp
Index: XObjectFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactory.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XObjectFactory.hpp 1 Nov 2001 15:57:13 -0000 1.18
+++ XObjectFactory.hpp 21 Nov 2002 01:26:18 -0000 1.19
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
class MutableNodeRefList;
class NodeRefListBase;
@@ -345,6 +349,10 @@
bool
operator==(const XObjectFactory&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.29 +10 -2 xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp
Index: XObjectFactoryDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XObjectFactoryDefault.cpp 30 Sep 2002 22:08:24 -0000 1.28
+++ XObjectFactoryDefault.cpp 21 Nov 2002 01:26:18 -0000 1.29
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XObjectFactoryDefault::XObjectFactoryDefault(
unsigned int theXStringBlockSize,
unsigned int theXNumberBlockSize,
@@ -507,7 +511,7 @@
m_xnodesetAllocator.reset();
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::for_each;
#endif
@@ -523,3 +527,7 @@
m_xstringCache.clear();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.25 +9 -1 xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp
Index: XObjectFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectFactoryDefault.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XObjectFactoryDefault.hpp 27 Aug 2002 22:00:29 -0000 1.24
+++ XObjectFactoryDefault.hpp 21 Nov 2002 01:26:18 -0000 1.25
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -96,6 +96,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XBoolean;
class XNull;
class XNumber;
@@ -249,6 +253,10 @@
const XalanAutoPtr<XBoolean> m_xbooleanTrue;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +13 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxy.cpp
Index: XObjectResultTreeFragProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XObjectResultTreeFragProxy.cpp 19 Oct 2001 18:38:46 -0000 1.1
+++ XObjectResultTreeFragProxy.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,10 +59,18 @@
+#include <cassert>
+
+
+
#include <XalanDOM/XalanDOMException.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XObjectResultTreeFragProxy::XObjectResultTreeFragProxy(const XObject&
theValue) :
XObjectResultTreeFragProxyBase(),
m_proxy(theValue)
@@ -161,3 +169,7 @@
{
return 1;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxy.hpp
Index: XObjectResultTreeFragProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxy.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XObjectResultTreeFragProxy.hpp 19 Oct 2001 18:38:46 -0000 1.1
+++ XObjectResultTreeFragProxy.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XObjectResultTreeFragProxy : public
XObjectResultTreeFragProxyBase
{
public:
@@ -128,6 +132,10 @@
// Data members...
mutable XObjectResultTreeFragProxyText m_proxy;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.cpp
Index: XObjectResultTreeFragProxyBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObjectResultTreeFragProxyBase.cpp 23 Feb 2002 03:26:18 -0000
1.3
+++ XObjectResultTreeFragProxyBase.cpp 21 Nov 2002 01:26:18 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XObjectResultTreeFragProxyBase::s_emptyString;
@@ -325,3 +329,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.hpp
Index: XObjectResultTreeFragProxyBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObjectResultTreeFragProxyBase.hpp 23 Feb 2002 03:26:18 -0000
1.3
+++ XObjectResultTreeFragProxyBase.hpp 21 Nov 2002 01:26:18 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XObjectResultTreeFragProxyBase : public
ResultTreeFragBase, private XalanNodeList
{
public:
@@ -209,6 +213,10 @@
// Data members...
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +18 -2 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp
Index: XObjectResultTreeFragProxyText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObjectResultTreeFragProxyText.cpp 6 May 2002 05:26:59 -0000
1.3
+++ XObjectResultTreeFragProxyText.cpp 21 Nov 2002 01:26:18 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const XalanDOMString s_emptyString;
@@ -408,7 +412,15 @@
-static XalanDOMString s_nameString;
+XALAN_CPP_NAMESPACE_END
+
+
+
+static XALAN_CPP_NAMESPACE_QUALIFIER XalanDOMString s_nameString;
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -429,3 +441,7 @@
{
releaseMemory(::s_nameString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.hpp
Index: XObjectResultTreeFragProxyText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XObjectResultTreeFragProxyText.hpp 23 Feb 2002 03:26:18 -0000
1.2
+++ XObjectResultTreeFragProxyText.hpp 21 Nov 2002 01:26:18 -0000
1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XObject;
@@ -616,6 +620,10 @@
static const XalanDOMString& s_nameString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XObjectTypeCallback.cpp
Index: XObjectTypeCallback.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectTypeCallback.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XObjectTypeCallback.cpp 18 Dec 1999 19:47:55 -0000 1.1
+++ XObjectTypeCallback.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XObjectTypeCallback::XObjectTypeCallback()
{
}
@@ -68,3 +72,7 @@
XObjectTypeCallback::~XObjectTypeCallback()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XPath/XObjectTypeCallback.hpp
Index: XObjectTypeCallback.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectTypeCallback.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XObjectTypeCallback.hpp 10 Aug 2000 18:37:37 -0000 1.4
+++ XObjectTypeCallback.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class MutableNodeRefList;
class NodeRefListBase;
class ResultTreeFragBase;
@@ -173,6 +177,10 @@
virtual void
Null(const XObject& theObject) = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.80 +25 -17 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- XPath.cpp 20 Nov 2002 18:42:20 -0000 1.79
+++ XPath.cpp 21 Nov 2002 01:26:18 -0000 1.80
@@ -93,11 +93,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XPath::s_emptyString;
-XPath::XPath(const Locator* theLocator) :
+XPath::XPath(const LocatorType* theLocator) :
m_expression(),
m_locator(theLocator),
m_inStylesheet(false)
@@ -503,12 +507,12 @@
if(targetLocalName != 0)
{
-
if(::equals(targetLocalName, PSEUDONAME_ANY) == true)
+
if(XALAN_CPP_NAMESPACE_QUALIFIER equals(targetLocalName, PSEUDONAME_ANY) ==
true)
{
targetLocalName = PSEUDONAME_ANY;
if (targetNamespace == 0 ||
-
::equals(*targetNamespace, PSEUDONAME_ANY) == true)
+
XALAN_CPP_NAMESPACE_QUALIFIER equals(*targetNamespace, PSEUDONAME_ANY)
== true)
{
score = eMatchScoreNodeTest;
}
@@ -527,7 +531,7 @@
targetLocalName = PSEUDONAME_ANY;
if
(targetNamespace == 0 ||
-
::equals(*targetNamespace, PSEUDONAME_ANY) == true)
+
XALAN_CPP_NAMESPACE_QUALIFIER equals(*targetNamespace, PSEUDONAME_ANY) == true)
{
score = eMatchScoreNodeTest;
}
@@ -2686,7 +2690,7 @@
// This is an optimization to keep
non-namespace attributes out of
// the call to nodeTest().
if (startsWith(theNodeName,
DOMServices::s_XMLNamespaceWithSeparator) == true ||
- ::equals(theNodeName,
DOMServices::s_XMLNamespace) == true)
+ XALAN_CPP_NAMESPACE_QUALIFIER
equals(theNodeName, DOMServices::s_XMLNamespace) == true)
{
const eMatchScore score =
theTester(*attr,
XalanNode::ATTRIBUTE_NODE);
@@ -2786,7 +2790,7 @@
currentExpression.getToken(tokenPosition);
assert(name != 0);
- if (::equals(context->getNodeName(),
name->str()) == true)
+ if (XALAN_CPP_NAMESPACE_QUALIFIER
equals(context->getNodeName(), name->str()) == true)
{
score = eMatchScoreQName;
}
@@ -2862,7 +2866,7 @@
if(0 != length(targetNS) && 0 !=
length(contextNS))
{
- test = ::equals(contextNS,
targetNS);
+ test =
XALAN_CPP_NAMESPACE_QUALIFIER equals(contextNS, targetNS);
didMatchNS = true;
}
@@ -2894,7 +2898,7 @@
const bool
isNamespace =
startsWith(attrName, DOMServices::s_XMLNamespaceWithSeparator) ||
-
::equals(attrName, DOMServices::s_XMLNamespace);
+
XALAN_CPP_NAMESPACE_QUALIFIER equals(attrName, DOMServices::s_XMLNamespace);
if(XPathExpression::eELEMWILDCARD == queueIndex)
{
@@ -2934,7 +2938,7 @@
const XalanDOMString& localAttrName =
DOMServices::getLocalNameOfNode(*context);
-
if (::equals(localAttrName, targetLocalName) == true)
+
if (XALAN_CPP_NAMESPACE_QUALIFIER equals(localAttrName, targetLocalName) ==
true)
{
score = eMatchScoreQName;
}
@@ -2960,7 +2964,7 @@
const XalanDOMString& targetLocalName =
currentExpression.getToken(queueIndex)->str();
-
if (::equals(theNamespace, targetLocalName) == true)
+
if (XALAN_CPP_NAMESPACE_QUALIFIER equals(theNamespace, targetLocalName) == true)
{
score = eMatchScoreQName;
}
@@ -2985,7 +2989,7 @@
const
XalanDOMString& targetLocalName =
currentExpression.getToken(queueIndex)->str();
- if
(::equals(DOMServices::getLocalNameOfNode(*context),
+ if
(XALAN_CPP_NAMESPACE_QUALIFIER equals(DOMServices::getLocalNameOfNode(*context),
targetLocalName) == true)
{
score =
eMatchScoreQName;
@@ -3340,7 +3344,7 @@
assert(m_targetLocalName != 0);
if (XalanNode::PROCESSING_INSTRUCTION_NODE == nodeType &&
- ::equals(context.getNodeName(), *m_targetLocalName) == true)
+ XALAN_CPP_NAMESPACE_QUALIFIER equals(context.getNodeName(),
*m_targetLocalName) == true)
{
return eMatchScoreQName;
}
@@ -3619,7 +3623,7 @@
assert(m_targetLocalName != 0);
return length(context.getNamespaceURI()) == 0 &&
- ::equals(DOMServices::getLocalNameOfNode(context),
*m_targetLocalName);
+ XALAN_CPP_NAMESPACE_QUALIFIER
equals(DOMServices::getLocalNameOfNode(context), *m_targetLocalName);
}
@@ -3629,7 +3633,7 @@
{
assert(m_targetNamespace != 0);
- return ::equals(context.getNamespaceURI(), *m_targetNamespace);
+ return XALAN_CPP_NAMESPACE_QUALIFIER equals(context.getNamespaceURI(),
*m_targetNamespace);
}
@@ -3639,8 +3643,8 @@
{
assert(m_targetNamespace != 0 && m_targetLocalName != 0);
- return ::equals(DOMServices::getLocalNameOfNode(context),
*m_targetLocalName) == true &&
- ::equals(context.getNamespaceURI(), *m_targetNamespace) == true;
+ return XALAN_CPP_NAMESPACE_QUALIFIER
equals(DOMServices::getLocalNameOfNode(context), *m_targetLocalName) == true &&
+ XALAN_CPP_NAMESPACE_QUALIFIER equals(context.getNamespaceURI(),
*m_targetNamespace) == true;
}
@@ -3650,7 +3654,7 @@
{
assert(m_targetLocalName != 0);
- return ::equals(context.getLocalName(), *m_targetLocalName);
+ return XALAN_CPP_NAMESPACE_QUALIFIER equals(context.getLocalName(),
*m_targetLocalName);
}
@@ -3745,3 +3749,7 @@
{
s_functions.DestroyTable();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.36 +21 -8 xml-xalan/c/src/XPath/XPath.hpp
Index: XPath.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XPath.hpp 26 Sep 2002 05:12:34 -0000 1.35
+++ XPath.hpp 21 Nov 2002 01:26:18 -0000 1.36
@@ -83,7 +83,14 @@
-class Locator;
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class PrefixResolver;
class XObject;
class XalanNode;
@@ -94,6 +101,8 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
static const XalanDOMChar PSEUDONAME_ANY[];
static const XalanDOMChar PSEUDONAME_ROOT[];
static const XalanDOMChar PSEUDONAME_TEXT[];
@@ -161,7 +170,7 @@
eTargetType m_targetType;
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<TargetData> TargetDataVectorType;
#else
typedef std::vector<TargetData> TargetDataVectorType;
@@ -183,10 +192,10 @@
/**
* Construct an XPath.
*
- * @param theLocator The applicable Locator, if any.
+ * @param theLocator The applicable LocatorType, if any.
*/
explicit
- XPath(const Locator* theLocator = 0);
+ XPath(const LocatorType* theLocator = 0);
virtual
~XPath();
@@ -510,14 +519,14 @@
m_inStylesheet = fValue;
}
- const Locator*
+ const LocatorType*
getLocator() const
{
return m_locator;
}
void
- setLocator(const Locator* theLocator)
+ setLocator(const LocatorType* theLocator)
{
m_locator = theLocator;
}
@@ -1239,9 +1248,9 @@
XPathExpression m_expression;
/**
- * A Locator for reporting errors.
+ * A LocatorType for reporting errors.
*/
- const Locator* m_locator;
+ const LocatorType*
m_locator;
/**
* If true, the XPath can allocated XObjects in more
@@ -1259,6 +1268,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XPathAllocator.cpp
Index: XPathAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathAllocator.cpp 28 Feb 2001 23:16:06 -0000 1.1
+++ XPathAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathAllocator::XPathAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -93,3 +97,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XPathAllocator.hpp
Index: XPathAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathAllocator.hpp 9 Mar 2001 20:52:19 -0000 1.2
+++ XPathAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XPathAllocator
{
public:
@@ -155,6 +159,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XPath/XPathConstructionContext.cpp
Index: XPathConstructionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathConstructionContext.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathConstructionContext.cpp 31 Oct 2002 07:12:03 -0000 1.1
+++ XPathConstructionContext.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathConstructionContext::XPathConstructionContext()
{
}
@@ -68,3 +72,7 @@
XPathConstructionContext::~XPathConstructionContext()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XPath/XPathConstructionContext.hpp
Index: XPathConstructionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathConstructionContext.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathConstructionContext.hpp 31 Oct 2002 07:12:03 -0000 1.1
+++ XPathConstructionContext.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
//
// An abstract class which provides support for constructing the internal
// representation of a stylesheet.
@@ -190,6 +194,10 @@
};
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XPath/XPathConstructionContextDefault.cpp
Index: XPathConstructionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XPath/XPathConstructionContextDefault.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathConstructionContextDefault.cpp 31 Oct 2002 07:12:03 -0000
1.1
+++ XPathConstructionContextDefault.cpp 21 Nov 2002 01:26:18 -0000
1.2
@@ -61,6 +61,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathConstructionContextDefault::XPathConstructionContextDefault() :
XPathConstructionContext(),
m_stringPool(),
@@ -116,3 +120,7 @@
{
return m_stringCache.release(theString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XPath/XPathConstructionContextDefault.hpp
Index: XPathConstructionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XPath/XPathConstructionContextDefault.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathConstructionContextDefault.hpp 31 Oct 2002 07:12:03 -0000
1.1
+++ XPathConstructionContextDefault.hpp 21 Nov 2002 01:26:18 -0000
1.2
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
*
* An default implementation of an abtract class which provides support for
@@ -117,6 +121,10 @@
XalanDOMStringCache m_stringCache;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +1 -1 xml-xalan/c/src/XPath/XPathDefinitions.hpp
Index: XPathDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathDefinitions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathDefinitions.hpp 28 Jan 2000 14:50:47 -0000 1.2
+++ XPathDefinitions.hpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.2 +10 -3 xml-xalan/c/src/XPath/XPathEnvSupport.cpp
Index: XPathEnvSupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupport.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathEnvSupport.cpp 18 Dec 1999 19:47:55 -0000 1.1
+++ XPathEnvSupport.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,8 +58,11 @@
-XPathEnvSupport::XPathEnvSupport() :
- Resettable()
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+XPathEnvSupport::XPathEnvSupport()
{
}
@@ -68,3 +71,7 @@
XPathEnvSupport::~XPathEnvSupport()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.21 +18 -6 xml-xalan/c/src/XPath/XPathEnvSupport.hpp
Index: XPathEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupport.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XPathEnvSupport.hpp 20 Nov 2002 18:42:06 -0000 1.20
+++ XPathEnvSupport.hpp 21 Nov 2002 01:26:18 -0000 1.21
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,6 @@
#include <PlatformSupport/DOMStringHelper.hpp>
-#include <PlatformSupport/Resettable.hpp>
@@ -85,7 +84,14 @@
-class Locator;
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class NodeRefListBase;
class PrefixResolver;
class XObject;
@@ -98,10 +104,12 @@
-class XALAN_XPATH_EXPORT XPathEnvSupport : public Resettable
+class XALAN_XPATH_EXPORT XPathEnvSupport
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
typedef Function::XObjectArgVectorType XObjectArgVectorType;
XPathEnvSupport();
@@ -184,7 +192,7 @@
* @param theNamespace namespace of function
* @param functionName extension function name
* @param argVec vector of arguments to function
- * @param locator A Locator instance for error reporting.
+ * @param locator A LocatorType instance for error reporting.
* @return pointer to XObject result
*/
virtual XObjectPtr
@@ -194,7 +202,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator*
locator) const = 0;
+ const LocatorType*
locator) const = 0;
enum eSource { eXMLParser = 1,
eXSLTProcessor = 2,
@@ -251,6 +259,10 @@
bool
operator==(const XPathEnvSupport&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.35 +11 -3 xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
Index: XPathEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XPathEnvSupportDefault.cpp 14 Nov 2002 23:59:31 -0000 1.34
+++ XPathEnvSupportDefault.cpp 21 Nov 2002 01:26:18 -0000 1.35
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,7 @@
-#if !defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_NO_STD_NAMESPACE)
using std::cerr;
using std::endl;
using std::for_each;
@@ -100,6 +100,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathEnvSupportDefault::NamespaceFunctionTablesType
XPathEnvSupportDefault::s_externalFunctions;
@@ -428,7 +432,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator*
locator) const
+ const LocatorType*
locator) const
{
const Function* const theFunction = findFunction(theNamespace,
functionName);
@@ -516,3 +520,7 @@
MapValueDeleteFunctor<FunctionTableInnerType>());
#endif
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.25 +11 -3 xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XPathEnvSupportDefault.hpp 3 Nov 2002 03:33:16 -0000 1.24
+++ XPathEnvSupportDefault.hpp 21 Nov 2002 01:26:18 -0000 1.25
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Dummy class in order to make the XPath object happy
* for diagnostic purposes.
@@ -82,7 +86,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanDOMString, XalanDocument*, less<XalanDOMString> >
SourceDocsTableType;
typedef map<XalanDOMString, const Function*, less<XalanDOMString> >
FunctionTableType;
typedef map<XalanDOMString, FunctionTableType, less<XalanDOMString> >
NamespaceFunctionTablesType;
@@ -202,7 +206,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator*
locator) const;
+ const LocatorType*
locator) const;
virtual bool
problem(
@@ -303,6 +307,10 @@
static NamespaceFunctionTablesType s_externalFunctions;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/XPath/XPathEvaluator.cpp
Index: XPathEvaluator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEvaluator.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathEvaluator.cpp 31 Oct 2002 07:12:03 -0000 1.6
+++ XPathEvaluator.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static XPathInit* theXPathInit = 0;
@@ -482,3 +486,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XPath/XPathEvaluator.hpp
Index: XPathEvaluator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEvaluator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathEvaluator.hpp 31 Oct 2002 07:12:03 -0000 1.5
+++ XPathEvaluator.hpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,6 +80,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if !defined(XALAN_AUTO_PTR_REQUIRES_DEFINITION)
class XObjectFactory;
class XPathFactoryDefault;
@@ -453,6 +457,10 @@
const XalanAutoPtr<XPathExecutionContextDefault>
m_executionContext;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XPathExecutionContext.cpp
Index: XPathExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathExecutionContext.cpp 3 Apr 2002 05:08:34 -0000 1.2
+++ XPathExecutionContext.cpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathExecutionContext::XPathExecutionContext(XObjectFactory*
theXObjectFactory) :
m_xobjectFactory(theXObjectFactory)
{
@@ -69,3 +73,7 @@
XPathExecutionContext::~XPathExecutionContext()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.52 +21 -14 xml-xalan/c/src/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- XPathExecutionContext.hpp 3 Nov 2002 03:33:16 -0000 1.51
+++ XPathExecutionContext.hpp 21 Nov 2002 01:26:18 -0000 1.52
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,10 @@
-class Locator;
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanDecimalFormatSymbols;
class PrefixResolver;
class XalanQName;
@@ -109,7 +112,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XObjectPtr> XObjectArgVectorType;
#else
typedef std::vector<XObjectPtr> XObjectArgVectorType;
@@ -296,7 +299,7 @@
* @param functionName extension function name
* @param context The context node
* @param argVec vector of arguments to function
- * @param locator A Locator instance for error reporting
+ * @param locator A LocatorType instance for error reporting
* @return pointer to XObject result
*/
virtual const XObjectPtr
@@ -305,7 +308,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator*
locator) = 0;
+ const LocatorType*
locator) = 0;
/**
* Provides support for XML parsing service.
@@ -534,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 Locator to use for error reporting. Can
be 0.
+ * @param locator The LocatorType to use for error reporting.
Can be 0.
* @param nodelist A node list to contain the nodes found
*/
virtual void
@@ -542,7 +545,7 @@
XalanDocument* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& nodelist) = 0;
/**
@@ -555,7 +558,7 @@
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const Locator* locator = 0) = 0;
+ const LocatorType* locator = 0) = 0;
/**
* Retrieve the resolver for namespaces.
@@ -705,42 +708,46 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
error(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
virtual void
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
protected:
XObjectFactory* m_xobjectFactory;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.54 +17 -9 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- XPathExecutionContextDefault.cpp 3 Nov 2002 03:33:16 -0000 1.53
+++ XPathExecutionContextDefault.cpp 21 Nov 2002 01:26:18 -0000 1.54
@@ -86,6 +86,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const NodeRefList XPathExecutionContextDefault::s_dummyList;
@@ -284,7 +288,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator* locator)
+ const LocatorType* locator)
{
assert(m_xpathEnvSupport != 0);
@@ -361,7 +365,7 @@
XalanDocument* /* doc */,
const XalanDOMString& /* name */,
const XalanDOMString& /* ref */,
- const Locator* /* locator */,
+ const LocatorType* /* locator */,
MutableNodeRefList& /* nodelist */)
{
}
@@ -371,7 +375,7 @@
const XObjectPtr
XPathExecutionContextDefault::getVariable(
const XalanQName& name,
- const Locator* /* locator */)
+ const LocatorType* /* locator */)
{
assert(m_xobjectFactory != 0);
@@ -438,7 +442,7 @@
XPathExecutionContextDefault::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -490,7 +494,7 @@
XPathExecutionContextDefault::error(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
error(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -501,7 +505,7 @@
XPathExecutionContextDefault::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -553,7 +557,7 @@
XPathExecutionContextDefault::warn(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -564,7 +568,7 @@
XPathExecutionContextDefault::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -616,7 +620,7 @@
XPathExecutionContextDefault::message(
const char* msg,
const XalanNode* sourceNode,
- const Locator* locator) const
+ const LocatorType* locator) const
{
message(TranscodeFromLocalCodePage(msg), sourceNode, locator);
}
@@ -666,3 +670,7 @@
{
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.46 +18 -10 xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XPathExecutionContextDefault.hpp 3 Nov 2002 03:33:16 -0000 1.45
+++ XPathExecutionContextDefault.hpp 21 Nov 2002 01:26:18 -0000 1.46
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -94,6 +94,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
class XPathEnvSupport;
class XalanQName;
@@ -225,7 +229,7 @@
const XalanDOMString& functionName,
XalanNode*
context,
const XObjectArgVectorType& argVec,
- const Locator*
locator);
+ const LocatorType*
locator);
virtual XalanDocument*
parseXML(
@@ -259,13 +263,13 @@
XalanDocument* doc,
const XalanDOMString& name,
const XalanDOMString& ref,
- const Locator* locator,
+ const LocatorType* locator,
MutableNodeRefList& nodelist);
virtual const XObjectPtr
getVariable(
const XalanQName& name,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
virtual const PrefixResolver*
getPrefixResolver() const;
@@ -311,37 +315,37 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
virtual void
error(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
virtual void
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const;
+ const LocatorType* locator = 0) const;
protected:
@@ -369,6 +373,10 @@
static const NodeRefList s_dummyList;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.40 +12 -14 xml-xalan/c/src/XPath/XPathExpression.cpp
Index: XPathExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- XPathExpression.cpp 14 Nov 2002 23:59:31 -0000 1.39
+++ XPathExpression.cpp 21 Nov 2002 01:26:18 -0000 1.40
@@ -80,6 +80,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// This is an array which indicates which of the value defined by
// XPathExpression::eOpCodes are node tests.
static const bool theNodeTestOpCodesArray[] =
@@ -359,10 +363,8 @@
void
XPathExpression::reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::fill;
- using std::for_each;
-#endif
+ XALAN_USING_STD(fill);
+ XALAN_USING_STD(for_each);
m_opMap.clear();
m_tokenQueue.clear();
@@ -718,11 +720,7 @@
void
XPathExpression::dumpOpCodeMap(
-#if defined(XALAN_NO_NAMESPACES)
- ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
+ OstreamType& theStream,
OpCodeMapSizeType theStartPosition) const
{
for (OpCodeMapSizeType i = theStartPosition;
@@ -736,11 +734,7 @@
void
XPathExpression::dumpTokenQueue(
-#if defined(XALAN_NO_NAMESPACES)
- ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
+ OstreamType& theStream,
TokenQueueSizeType theStartPosition) const
{
for (TokenQueueSizeType i = theStartPosition;
@@ -907,3 +901,7 @@
// Update the op map length.
m_opMap[s_opCodeMapLengthIndex]++;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.30 +20 -13 xml-xalan/c/src/XPath/XPathExpression.hpp
Index: XPathExpression.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExpression.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XPathExpression.hpp 14 Nov 2002 23:59:31 -0000 1.29
+++ XPathExpression.hpp 21 Nov 2002 01:26:18 -0000 1.30
@@ -88,10 +88,20 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XPathExpression
{
public:
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef ostream OstreamType;
+#else
+ typedef std::ostream OstreamType;
+#endif
+
/**
* List of operations codes.
*
@@ -696,7 +706,7 @@
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<int>
OpCodeMapType;
typedef vector<XToken> TokenQueueType;
@@ -1261,11 +1271,7 @@
*/
void
dumpOpCodeMap(
-#if defined(XALAN_NO_NAMESPACES)
- ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
+ OstreamType& theStream,
OpCodeMapSizeType theStartPosition = 0) const;
/**
@@ -1275,8 +1281,9 @@
* @param theStartPosition starting position in token queue
*/
void
- dumpTokenQueue(PrintWriter& thePrintWriter,
- TokenQueueSizeType theStartPosition = 0)
const;
+ dumpTokenQueue(
+ PrintWriter& thePrintWriter,
+ TokenQueueSizeType theStartPosition = 0) const;
/**
* Diagnostic function to output the token queue.
@@ -1286,11 +1293,7 @@
*/
void
dumpTokenQueue(
-#if defined(XALAN_NO_NAMESPACES)
- ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
+ OstreamType& theStream,
TokenQueueSizeType theStartPosition = 0) const;
/**
@@ -1515,6 +1518,10 @@
NumberLiteralValueVectorType m_numberLiteralValues;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XPathFactory.cpp
Index: XPathFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathFactory.cpp 18 Dec 1999 19:47:55 -0000 1.1
+++ XPathFactory.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathFactory::XPathFactory()
{
}
@@ -68,3 +72,7 @@
XPathFactory::~XPathFactory()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +12 -2 xml-xalan/c/src/XPath/XPathFactory.hpp
Index: XPathFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactory.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XPathFactory.hpp 13 Oct 2000 21:20:52 -0000 1.9
+++ XPathFactory.hpp 21 Nov 2002 01:26:18 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPath;
@@ -115,7 +119,7 @@
* A functor for use with stl algorithms.
*
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DeleteXPathFunctor : public unary_function<const XPath*, void>
#else
struct DeleteXPathFunctor : public std::unary_function<const XPath*,
void>
@@ -277,5 +281,11 @@
XPathFactory* m_factory;
const XPath* m_object;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
+
#endif // XPATHFACTORY_HEADER_GUARD_1357924680
1.2 +9 -1 xml-xalan/c/src/XPath/XPathFactoryBlock.cpp
Index: XPathFactoryBlock.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactoryBlock.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathFactoryBlock.cpp 28 Feb 2001 23:16:07 -0000 1.1
+++ XPathFactoryBlock.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathFactoryBlock::XPathFactoryBlock(unsigned int theBlockSize) :
XPathFactory(),
m_allocator(theBlockSize)
@@ -102,3 +106,7 @@
{
return m_allocator.create();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XPathFactoryBlock.hpp
Index: XPathFactoryBlock.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactoryBlock.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathFactoryBlock.hpp 28 Feb 2001 23:16:07 -0000 1.1
+++ XPathFactoryBlock.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XPathFactoryBlock : public XPathFactory
{
@@ -109,6 +113,10 @@
XPathAllocator m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -4 xml-xalan/c/src/XPath/XPathFactoryDefault.cpp
Index: XPathFactoryDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactoryDefault.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathFactoryDefault.cpp 6 Jun 2001 21:50:16 -0000 1.10
+++ XPathFactoryDefault.cpp 21 Nov 2002 01:26:18 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathFactoryDefault::XPathFactoryDefault() :
XPathFactory(),
m_xpaths()
@@ -85,9 +89,7 @@
void
XPathFactoryDefault::reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(m_xpaths.begin(),
m_xpaths.end(),
@@ -138,3 +140,7 @@
return theXPath;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +10 -2 xml-xalan/c/src/XPath/XPathFactoryDefault.hpp
Index: XPathFactoryDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFactoryDefault.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathFactoryDefault.hpp 6 Jun 2001 21:50:17 -0000 1.10
+++ XPathFactoryDefault.hpp 21 Nov 2002 01:26:18 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XPathFactoryDefault : public XPathFactory
{
@@ -95,7 +99,7 @@
create();
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef set<const XPath*, less<const XPath*> > CollectionType;
#else
typedef std::set<const XPath*> CollectionType;
@@ -120,6 +124,10 @@
CollectionType m_xpaths;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.25 +12 -6 xml-xalan/c/src/XPath/XPathFunctionTable.cpp
Index: XPathFunctionTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XPathFunctionTable.cpp 3 Nov 2002 03:34:13 -0000 1.24
+++ XPathFunctionTable.cpp 21 Nov 2002 01:26:18 -0000 1.25
@@ -97,6 +97,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class FunctionNotImplemented : public Function
{
public:
@@ -499,9 +503,7 @@
{
try
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(
m_functionTable,
@@ -578,8 +580,8 @@
XPathExceptionFunctionNotAvailable::XPathExceptionFunctionNotAvailable(
- int theFunctionNumber,
- const Locator& theLocator) :
+ int
theFunctionNumber,
+ const LocatorType& theLocator) :
XalanXPathException(
theLocator,
TranscodeFromLocalCodePage("The
specified function number is not available: ") +
LongToDOMString(theFunctionNumber))
@@ -590,7 +592,7 @@
XPathExceptionFunctionNotAvailable::XPathExceptionFunctionNotAvailable(
const XalanDOMString& theFunctionName,
- const Locator& theLocator) :
+ const LocatorType& theLocator) :
XalanXPathException(
theLocator,
TranscodeFromLocalCodePage("The
specified function is not available: ") + theFunctionName)
@@ -1276,3 +1278,7 @@
const SizeType XPathFunctionTable::s_functionNamesSize =
sizeof(s_functionNames) / sizeof(s_functionNames[0]);
+
+
+
+XALAN_CPP_NAMESPACE_END
1.24 +10 -4 xml-xalan/c/src/XPath/XPathFunctionTable.hpp
Index: XPathFunctionTable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XPathFunctionTable.hpp 26 Sep 2002 05:44:21 -0000 1.23
+++ XPathFunctionTable.hpp 21 Nov 2002 01:26:18 -0000 1.24
@@ -81,7 +81,7 @@
-class Locator;
+XALAN_CPP_NAMESPACE_BEGIN
@@ -92,17 +92,19 @@
{
public:
+ typedef Function::LocatorType LocatorType;
+
XPathExceptionFunctionNotAvailable(int theFunctionNumber);
XPathExceptionFunctionNotAvailable(const XalanDOMString&
theFunctionName);
XPathExceptionFunctionNotAvailable(
int theFunctionNumber,
- const Locator& theLocator);
+ const LocatorType& theLocator);
XPathExceptionFunctionNotAvailable(
const XalanDOMString& theFunctionName,
- const Locator& theLocator);
+ const LocatorType& theLocator);
~XPathExceptionFunctionNotAvailable();
};
@@ -288,7 +290,7 @@
#if defined(XALAN_NO_MEMBER_TEMPLATES)
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMString>
InstalledFunctionNameVectorType;
#else
typedef std::vector<XalanDOMString>
InstalledFunctionNameVectorType;
@@ -501,6 +503,10 @@
// The last one in the table of function names.
static const FunctionNameTableEntry* const s_lastFunctionName;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XPath/XPathInit.cpp
Index: XPathInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathInit.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathInit.cpp 5 Sep 2002 01:38:03 -0000 1.4
+++ XPathInit.cpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
unsigned long XPathInit::s_initCounter = 0;
@@ -122,3 +126,7 @@
XBoolean::terminate();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XPathInit.hpp
Index: XPathInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathInit.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathInit.hpp 31 Aug 2000 19:43:05 -0000 1.1
+++ XPathInit.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XPathInit
{
public:
@@ -103,6 +107,10 @@
static unsigned long s_initCounter;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/XPath/XPathParserException.cpp
Index: XPathParserException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathParserException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathParserException.cpp 4 Jan 2002 17:29:07 -0000 1.5
+++ XPathParserException.cpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathParserException::XPathParserException(
const XalanDOMString& message,
@@ -73,7 +77,7 @@
XPathParserException::XPathParserException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType) :
XalanXPathException(theLocator, theMessage, 0, theType)
@@ -94,3 +98,7 @@
XPathParserException::~XPathParserException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/XPath/XPathParserException.hpp
Index: XPathParserException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathParserException.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathParserException.hpp 4 Jan 2002 17:29:07 -0000 1.6
+++ XPathParserException.hpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Exception class thrown when a problem parsing an XPath is encountered
*/
@@ -99,7 +103,7 @@
* @param theType type of exception, default is "XPathParserException"
*/
XPathParserException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
@@ -116,6 +120,10 @@
virtual
~XPathParserException();
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XPathProcessor.cpp
Index: XPathProcessor.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathProcessor.cpp 11 Apr 2000 14:46:20 -0000 1.2
+++ XPathProcessor.cpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathProcessor::XPathProcessor()
{
}
@@ -83,3 +87,7 @@
XPath::installFunction(theFunctionName,
theFunction);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +20 -6 xml-xalan/c/src/XPath/XPathProcessor.hpp
Index: XPathProcessor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessor.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathProcessor.hpp 31 Oct 2002 07:12:03 -0000 1.8
+++ XPathProcessor.hpp 21 Nov 2002 01:26:18 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,8 +69,16 @@
+
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class Function;
-class Locator;
class PrefixResolver;
class XPath;
class XPathConstructionContext;
@@ -81,6 +89,8 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
explicit
XPathProcessor();
@@ -95,7 +105,7 @@
* @param constructionContext The construction context
* @param expression expression that will be evaluated
* @param resolver prefix resolver to use
- * @param locator the Locator to use for error report.
May be null
+ * @param locator the LocatorType to use for error
report. May be null
*/
virtual void
initXPath(
@@ -103,7 +113,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator = 0) =
0;
+ const LocatorType* locator = 0) =
0;
/**
* Given a string, create an XSLT Match Pattern object.
@@ -112,7 +122,7 @@
* @param constructionContext The construction context
* @param expression expression that will be evaluated
* @param resolver prefix resolver to use
- * @param locator the Locator to use for error report.
May be null
+ * @param locator the LocatorType to use for error
report. May be null
*/
virtual void
initMatchPattern(
@@ -120,7 +130,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator = 0) =
0;
+ const LocatorType* locator = 0) =
0;
/**
* Given a string, and a reference to a function object, install the
@@ -134,6 +144,10 @@
const XalanDOMString& theFunctionName,
const Function& theFunction);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.64 +13 -5 xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
Index: XPathProcessorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- XPathProcessorImpl.cpp 31 Oct 2002 07:12:03 -0000 1.63
+++ XPathProcessorImpl.cpp 21 Nov 2002 01:26:18 -0000 1.64
@@ -87,6 +87,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XPathProcessorImpl::XPathProcessorImpl() :
m_token(),
m_tokenChar(0),
@@ -115,7 +119,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator)
+ const LocatorType* locator)
{
m_requireLiterals = false;
@@ -161,7 +165,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator)
+ const LocatorType* locator)
{
m_isMatchPattern = true;
@@ -1885,7 +1889,7 @@
m_expression->appendOpCode(XPathExpression::eFROM_CHILDREN);
}
- NodeTest(axisType);
+ NodeTest();
// Tell how long the step is without the predicate
m_expression->updateOpCodeLengthAfterNodeTest(opPos);
@@ -1917,7 +1921,7 @@
int
-XPathProcessorImpl::NodeTest(XPathExpression::eOpCodes axisType)
+XPathProcessorImpl::NodeTest()
{
assert(m_xpath != 0);
assert(m_expression != 0);
@@ -2385,7 +2389,7 @@
// This will be replaced by the right value.
m_expression->appendOpCode(XPathExpression::eENDOP);
- NodeTest(axisType);
+ NodeTest();
m_expression->updateOpCodeLengthAfterNodeTest(opPos);
@@ -2957,3 +2961,7 @@
{
0, XPathExpression::eENDOP
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.26 +13 -5 xml-xalan/c/src/XPath/XPathProcessorImpl.hpp
Index: XPathProcessorImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.hpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XPathProcessorImpl.hpp 14 Nov 2002 17:24:31 -0000 1.25
+++ XPathProcessorImpl.hpp 21 Nov 2002 01:26:18 -0000 1.26
@@ -83,6 +83,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -95,7 +99,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanDOMString,
XalanDOMString,
less<XalanDOMString> > StringToStringMapType;
@@ -122,7 +126,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
virtual void
initMatchPattern(
@@ -130,7 +134,7 @@
XPathConstructionContext& constructionContext,
const XalanDOMString& expression,
const PrefixResolver& resolver,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
private:
@@ -629,7 +633,7 @@
| 'processing-instruction' '(' Literal ')'
*/
int
- NodeTest(XPathExpression::eOpCodes axisType);
+ NodeTest();
/**
*
--------------------------------------------------------------------------------
@@ -800,7 +804,7 @@
bool
m_isMatchPattern;
- const Locator* m_locator;
+ const LocatorType* m_locator;
BoolVectorType
m_positionPredicateStack;
@@ -885,6 +889,10 @@
static const TableEntry s_dummyEntry;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XPath/XSpan.cpp
Index: XSpan.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XSpan.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSpan.cpp 10 Apr 2002 06:03:11 -0000 1.8
+++ XSpan.cpp 21 Nov 2002 01:26:18 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSpan::XSpan(BorrowReturnMutableNodeRefList& value) :
XNodeSet(value),
m_start(-1),
@@ -133,3 +137,7 @@
m_start = firstNodeOffset;
m_end = lastNodeOffset;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XPath/XSpan.hpp
Index: XSpan.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XSpan.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSpan.hpp 14 Aug 2000 16:33:59 -0000 1.8
+++ XSpan.hpp 21 Nov 2002 01:26:18 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XSpan : public XNodeSet
{
public:
@@ -145,6 +149,10 @@
int m_start;
int m_end;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.20 +5 -1 xml-xalan/c/src/XPath/XString.cpp
Index: XString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XString.cpp 4 Oct 2002 06:58:07 -0000 1.19
+++ XString.cpp 21 Nov 2002 01:26:18 -0000 1.20
@@ -59,7 +59,7 @@
-//#include <PlatformSupport/DOMStringHelper.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
@@ -140,3 +140,7 @@
{
return length(m_value);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.19 +8 -0 xml-xalan/c/src/XPath/XString.hpp
Index: XString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XString.hpp 4 Oct 2002 06:58:07 -0000 1.18
+++ XString.hpp 21 Nov 2002 01:26:18 -0000 1.19
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XString : public XStringBase
{
public:
@@ -121,6 +125,10 @@
XalanDOMString m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XPath/XStringAdapter.cpp
Index: XStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.4
+++ XStringAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringAdapter::XStringAdapter(const XObjectPtr& val) :
XStringBase(),
m_value(val)
@@ -124,3 +128,7 @@
{
return m_value->stringLength();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XStringAdapter.hpp
Index: XStringAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.3
+++ XStringAdapter.hpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringAdapter : public XStringBase
{
public:
@@ -117,6 +121,10 @@
const XObjectPtr m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XStringAdapterAllocator.cpp
Index: XStringAdapterAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapterAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringAdapterAllocator.cpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringAdapterAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringAdapterAllocator::XStringAdapterAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XStringAdapterAllocator.hpp
Index: XStringAdapterAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapterAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringAdapterAllocator.hpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringAdapterAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringAdapterAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1 xml-xalan/c/src/XPath/XStringAllocator.cpp
Index: XStringAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAllocator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringAllocator.cpp 30 Nov 2000 19:41:00 -0000 1.3
+++ XStringAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringAllocator::XStringAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -148,3 +152,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XStringAllocator.hpp
Index: XStringAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XStringAllocator.hpp 20 Nov 2000 20:04:32 -0000 1.2
+++ XStringAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringAllocator
{
public:
@@ -189,6 +193,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XPath/XStringBase.cpp
Index: XStringBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringBase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XStringBase.cpp 4 Oct 2002 06:58:07 -0000 1.6
+++ XStringBase.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringBase::XStringBase() :
XObject(eTypeString),
m_cachedNumberValue(0.0),
@@ -154,3 +158,7 @@
theCallbackObject.String(*this,
str());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XPath/XStringBase.hpp
Index: XStringBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringBase.hpp 4 Oct 2002 06:58:07 -0000 1.4
+++ XStringBase.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XPathEnvSupport;
@@ -134,6 +138,10 @@
mutable XObjectResultTreeFragProxy m_resultTreeFrag;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XPath/XStringCached.cpp
Index: XStringCached.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XStringCached.cpp 4 Oct 2002 06:58:07 -0000 1.6
+++ XStringCached.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringCached::XStringCached(GetAndReleaseCachedString& val) :
XStringBase(),
m_value(val)
@@ -131,3 +135,7 @@
{
return length(m_value.get());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XStringCached.hpp
Index: XStringCached.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringCached.hpp 4 Oct 2002 06:58:07 -0000 1.3
+++ XStringCached.hpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringCached : public XStringBase
{
public:
@@ -121,6 +125,10 @@
const GetAndReleaseCachedString m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/XPath/XStringCachedAllocator.cpp
Index: XStringCachedAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCachedAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringCachedAllocator.cpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringCachedAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringCachedAllocator::XStringCachedAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XStringCachedAllocator.hpp
Index: XStringCachedAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCachedAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringCachedAllocator.hpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringCachedAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringCachedAllocator
{
public:
@@ -168,6 +172,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/XPath/XStringReference.cpp
Index: XStringReference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XStringReference.cpp 4 Oct 2002 06:58:07 -0000 1.5
+++ XStringReference.cpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringReference::XStringReference(const XalanDOMString& val) :
XStringBase(),
m_value(val)
@@ -127,3 +131,7 @@
{
return length(m_value);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/XPath/XStringReference.hpp
Index: XStringReference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringReference.hpp 4 Oct 2002 06:58:07 -0000 1.3
+++ XStringReference.hpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringReference : public XStringBase
{
public:
@@ -118,6 +122,10 @@
const XalanDOMString& m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XStringReferenceAllocator.cpp
Index: XStringReferenceAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReferenceAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringReferenceAllocator.cpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringReferenceAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XStringReferenceAllocator::XStringReferenceAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XStringReferenceAllocator.hpp
Index: XStringReferenceAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReferenceAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringReferenceAllocator.hpp 21 Dec 2000 04:23:07 -0000 1.1
+++ XStringReferenceAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XStringReferenceAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/XPath/XToken.cpp
Index: XToken.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XToken.cpp 4 Oct 2002 06:58:07 -0000 1.6
+++ XToken.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XToken::XToken() :
XObject(eTypeString),
m_stringValue(),
@@ -226,3 +230,7 @@
XToken::dereferenced()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/XPath/XToken.hpp
Index: XToken.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XToken.hpp 4 Oct 2002 06:58:07 -0000 1.4
+++ XToken.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XToken : public XObject
{
public:
@@ -153,6 +157,10 @@
double m_numberValue;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp
Index: XTokenNumberAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XTokenNumberAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.5
+++ XTokenNumberAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XTokenNumberAdapter::XTokenNumberAdapter(const XToken& theToken) :
XNumberBase(),
m_value(theToken)
@@ -144,3 +148,7 @@
{
return eTypeXTokenNumberAdapter;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XPath/XTokenNumberAdapter.hpp
Index: XTokenNumberAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapter.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XTokenNumberAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.4
+++ XTokenNumberAdapter.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XToken;
@@ -129,6 +133,10 @@
// XToken instance that we're adapting...
const XToken& m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XTokenNumberAdapterAllocator.cpp
Index: XTokenNumberAdapterAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapterAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XTokenNumberAdapterAllocator.cpp 16 Jan 2001 02:34:46 -0000 1.1
+++ XTokenNumberAdapterAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XTokenNumberAdapterAllocator::XTokenNumberAdapterAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XTokenNumberAdapterAllocator.hpp
Index: XTokenNumberAdapterAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapterAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XTokenNumberAdapterAllocator.hpp 16 Jan 2001 02:34:46 -0000 1.1
+++ XTokenNumberAdapterAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XTokenNumberAdapterAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/XPath/XTokenStringAdapter.cpp
Index: XTokenStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XTokenStringAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.5
+++ XTokenStringAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.6
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XTokenStringAdapter::XTokenStringAdapter(const XToken& theToken) :
XStringBase(),
m_value(theToken)
@@ -144,3 +148,7 @@
{
return eTypeXTokenStringAdapter;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +8 -0 xml-xalan/c/src/XPath/XTokenStringAdapter.hpp
Index: XTokenStringAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapter.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XTokenStringAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.4
+++ XTokenStringAdapter.hpp 21 Nov 2002 01:26:18 -0000 1.5
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XToken;
@@ -129,6 +133,10 @@
// XToken instance that we're adapting...
const XToken& m_value;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XTokenStringAdapterAllocator.cpp
Index: XTokenStringAdapterAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapterAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XTokenStringAdapterAllocator.cpp 16 Jan 2001 02:34:46 -0000 1.1
+++ XTokenStringAdapterAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XTokenStringAdapterAllocator::XTokenStringAdapterAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -116,3 +120,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XTokenStringAdapterAllocator.hpp
Index: XTokenStringAdapterAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapterAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XTokenStringAdapterAllocator.hpp 16 Jan 2001 02:34:46 -0000 1.1
+++ XTokenStringAdapterAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XTokenStringAdapterAllocator
{
public:
@@ -166,6 +170,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +9 -0 xml-xalan/c/src/XPath/XUnknown.cpp
Index: XUnknown.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XUnknown.cpp 4 Oct 2002 06:58:07 -0000 1.14
+++ XUnknown.cpp 21 Nov 2002 01:26:18 -0000 1.15
@@ -66,6 +66,11 @@
#include "XObjectTypeCallback.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDOMString XUnknown::s_unknownVariableString;
XalanDOMString XUnknown::s_unknownString;
@@ -190,3 +195,7 @@
releaseMemory(s_unknownVariableString);
releaseMemory(s_unknownString);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +8 -0 xml-xalan/c/src/XPath/XUnknown.hpp
Index: XUnknown.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XUnknown.hpp 4 Oct 2002 06:58:07 -0000 1.12
+++ XUnknown.hpp 21 Nov 2002 01:26:18 -0000 1.13
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XUnknown : public XObject
{
public:
@@ -144,6 +148,10 @@
static XalanDOMString s_unknownString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +13 -5 xml-xalan/c/src/XPath/XalanQName.cpp
Index: XalanQName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQName.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanQName.cpp 3 Nov 2002 03:31:54 -0000 1.6
+++ XalanQName.cpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XalanQName::s_emptyString;
@@ -115,11 +119,11 @@
{
const XalanDOMString* nsURI = 0;
- if(::equals(prefix, DOMServices::s_XMLString))
+ if(prefix == DOMServices::s_XMLString)
{
nsURI = &DOMServices::s_XMLNamespaceURI;
}
- else if (::equals(prefix, DOMServices::s_XMLNamespace))
+ else if (prefix == DOMServices::s_XMLNamespace)
{
nsURI = &DOMServices::s_XMLNamespacePrefixURI;
}
@@ -133,7 +137,7 @@
const XalanDOMString& thisPrefix = ns.getPrefix();
- if(::equals(prefix, thisPrefix))
+ if(prefix == thisPrefix)
{
nsURI = &ns.getURI();
@@ -197,7 +201,7 @@
const NameSpace& ns = namespaces[j - 1];
const XalanDOMString& thisURI = ns.getURI();
- if(::equals(uri, thisURI))
+ if(uri == thisURI)
{
thePrefix = &ns.getPrefix();
@@ -351,3 +355,7 @@
XalanQName::isValidNCName(theLocalName, theLength -
theIndex - 1);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +13 -5 xml-xalan/c/src/XPath/XalanQName.hpp
Index: XalanQName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQName.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanQName.hpp 3 Nov 2002 03:31:54 -0000 1.6
+++ XalanQName.hpp 21 Nov 2002 01:26:18 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanElement;
class XPathEnvSupport;
@@ -102,7 +106,7 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<NameSpace>
NamespaceVectorType;
typedef deque<NamespaceVectorType>
NamespacesStackType;
#else
@@ -159,7 +163,7 @@
bool
isEmpty() const
{
- return ::isEmpty(getNamespace()) && ::isEmpty(getLocalPart());
+ return getNamespace().empty() && getLocalPart().empty();
}
/**
@@ -174,8 +178,8 @@
{
// Note that we do not use our member variables here. See
// class QNameReference for details...
- return ::equals(getLocalPart(), theRHS.getLocalPart()) &&
- ::equals(getNamespace(), theRHS.getNamespace());
+ return getLocalPart() == theRHS.getLocalPart() &&
+ getNamespace() == theRHS.getNamespace();
}
class XALAN_XPATH_EXPORT PrefixResolverProxy : public PrefixResolver
@@ -386,6 +390,10 @@
return false;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/XPath/XalanQNameByReference.cpp
Index: XalanQNameByReference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByReference.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanQNameByReference.cpp 21 Sep 2002 01:24:21 -0000 1.2
+++ XalanQNameByReference.cpp 21 Nov 2002 01:26:18 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanQNameByReference::XalanQNameByReference() :
XalanQName(),
m_namespace(&s_emptyString),
@@ -120,3 +124,7 @@
return *m_namespace;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1 xml-xalan/c/src/XPath/XalanQNameByReference.hpp
Index: XalanQNameByReference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByReference.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanQNameByReference.hpp 21 Sep 2002 01:24:21 -0000 1.3
+++ XalanQNameByReference.hpp 21 Nov 2002 01:26:18 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XalanQNameByReference : public XalanQName
{
public:
@@ -167,6 +171,10 @@
const XalanDOMString* m_localpart;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +27 -19 xml-xalan/c/src/XPath/XalanQNameByValue.cpp
Index: XalanQNameByValue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValue.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanQNameByValue.cpp 3 Nov 2002 03:32:29 -0000 1.8
+++ XalanQNameByValue.cpp 21 Nov 2002 01:26:18 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanQNameByValue::XalanQNameByValue() :
XalanQName(),
m_namespace(),
@@ -114,7 +118,7 @@
XalanQNameByValue::XalanQNameByValue(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault) :
m_namespace(),
m_localpart()
@@ -132,7 +136,7 @@
XalanQNameByValue::XalanQNameByValue(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault) :
m_namespace(),
m_localpart()
@@ -154,7 +158,7 @@
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport,
- const Locator* locator) :
+ const LocatorType* locator) :
m_namespace(),
m_localpart()
{
@@ -172,7 +176,7 @@
XalanQNameByValue::XalanQNameByValue(
const XalanDOMString& qname,
const PrefixResolver* theResolver,
- const Locator* locator) :
+ const LocatorType* locator) :
m_namespace(),
m_localpart()
{
@@ -211,7 +215,7 @@
XalanQNameByValue::set(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault)
{
initialize(
@@ -228,7 +232,7 @@
XalanQNameByValue::set(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault)
{
assert(qname != 0);
@@ -247,7 +251,7 @@
XalanQNameByValue::set(
const XalanDOMString& qname,
const PrefixResolver* theResolver,
- const Locator* locator)
+ const LocatorType* locator)
{
resolvePrefix(
c_wstr(qname),
@@ -262,7 +266,7 @@
XalanQNameByValue::set(
const XalanDOMChar* qname,
const PrefixResolver* theResolver,
- const Locator* locator)
+ const LocatorType* locator)
{
assert(qname != 0);
@@ -277,8 +281,8 @@
void
throwException(
- const XalanDOMString& theMessage,
- const Locator* theLocator)
+ const XalanDOMString&
theMessage,
+ const XalanQNameByValue::LocatorType* theLocator)
{
if (theLocator == 0)
{
@@ -298,7 +302,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type len,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault)
{
const XalanDOMString::size_type indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
@@ -315,9 +319,9 @@
m_localpart.assign(qname, indexOfNSSep);
- if(::equals(m_localpart, DOMServices::s_XMLNamespace))
+ if(m_localpart == DOMServices::s_XMLNamespace)
{
- ::clear(m_localpart);
+ m_localpart.clear();
}
else
{
@@ -366,7 +370,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type theLength,
const PrefixResolver* theResolver,
- const Locator* locator)
+ const LocatorType* locator)
{
const XalanDOMString::size_type indexOfNSSep = indexOf(qname,
XalanUnicode::charColon);
@@ -374,7 +378,7 @@
{
m_localpart.assign(qname, theLength);
- ::clear(m_namespace);
+ m_namespace.clear();
}
else
{
@@ -384,14 +388,14 @@
m_localpart.assign(qname, indexOfNSSep);
- if(::equals(m_localpart, DOMServices::s_XMLString))
+ if(m_localpart == DOMServices::s_XMLString)
{
m_namespace = DOMServices::s_XMLNamespaceURI;
}
// The default namespace is not resolved.
- else if(::equals(m_localpart, DOMServices::s_XMLNamespace))
+ else if(m_localpart == DOMServices::s_XMLNamespace)
{
- ::clear(m_localpart);
+ m_localpart.clear();
return;
}
@@ -426,3 +430,7 @@
m_localpart.assign(qname + indexOfNSSep + 1, theLength -
(indexOfNSSep + 1));
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +27 -14 xml-xalan/c/src/XPath/XalanQNameByValue.hpp
Index: XalanQNameByValue.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValue.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanQNameByValue.hpp 21 Sep 2002 01:24:21 -0000 1.7
+++ XalanQNameByValue.hpp 21 Nov 2002 01:26:18 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,8 +69,15 @@
+XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
-class Locator;
@@ -78,6 +85,8 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
/**
* Construct an empty XalanQNameByValue.
*/
@@ -121,7 +130,7 @@
XalanQNameByValue(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -136,7 +145,7 @@
XalanQNameByValue(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -154,7 +163,7 @@
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
/**
* Construct a XalanQNameByValue from a string, resolving the prefix
using the given
@@ -167,7 +176,7 @@
XalanQNameByValue(
const XalanDOMString& qname,
const PrefixResolver* theResolver = 0,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
virtual
~XalanQNameByValue();
@@ -224,7 +233,7 @@
set(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -241,7 +250,7 @@
set(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -257,7 +266,7 @@
set(
const XalanDOMString& qname,
const PrefixResolver* theResolver = 0,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
/**
* Set the local part and namespace URI of a XalanQNameByValue from
@@ -272,15 +281,15 @@
set(
const XalanDOMChar* qname,
const PrefixResolver* theResolver = 0,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
/**
* Clear the instance.
*/
void
clear()
{
- ::clear(m_namespace);
- ::clear(m_localpart);
+ m_namespace.clear();
+ m_localpart.clear();
}
XalanQNameByValue&
@@ -308,7 +317,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type len,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault);
void
@@ -316,7 +325,7 @@
const XalanDOMChar* qname,
XalanDOMString::size_type theLength,
const PrefixResolver* theResolver,
- const Locator* locator);
+ const LocatorType* locator);
// Data members...
@@ -324,6 +333,10 @@
XalanDOMString m_localpart;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -4 xml-xalan/c/src/XPath/XalanQNameByValueAllocator.cpp
Index: XalanQNameByValueAllocator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValueAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanQNameByValueAllocator.cpp 31 Oct 2002 07:12:03 -0000 1.1
+++ XalanQNameByValueAllocator.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanQNameByValueAllocator::XalanQNameByValueAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -111,7 +115,7 @@
XalanQNameByValueAllocator::create(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault)
{
data_type* const theBlock = m_allocator.allocateBlock();
@@ -131,7 +135,7 @@
XalanQNameByValueAllocator::create(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator,
+ const LocatorType* locator,
bool
fUseDefault)
{
data_type* const theBlock = m_allocator.allocateBlock();
@@ -153,7 +157,7 @@
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport,
- const Locator* locator)
+ const LocatorType* locator)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
@@ -172,7 +176,7 @@
XalanQNameByValueAllocator::create(
const XalanDOMString& qname,
const PrefixResolver* theResolver,
- const Locator* locator)
+ const LocatorType* locator)
{
data_type* const theBlock = m_allocator.allocateBlock();
assert(theBlock != 0);
@@ -184,3 +188,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +13 -4 xml-xalan/c/src/XPath/XalanQNameByValueAllocator.hpp
Index: XalanQNameByValueAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanQNameByValueAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanQNameByValueAllocator.hpp 31 Oct 2002 07:12:03 -0000 1.1
+++ XalanQNameByValueAllocator.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -73,12 +73,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XPATH_EXPORT XalanQNameByValueAllocator
{
public:
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;
@@ -136,7 +141,7 @@
create(
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -153,7 +158,7 @@
create(
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
- const Locator* locator = 0,
+ const LocatorType* locator = 0,
bool
fUseDefault = false);
/**
@@ -173,7 +178,7 @@
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
/**
* Create an instance.
@@ -188,7 +193,7 @@
create(
const XalanDOMString& qname,
const PrefixResolver* theResolver = 0,
- const Locator* locator = 0);
+ const LocatorType* locator = 0);
/**
* Determine if an object is owned by the allocator...
@@ -242,6 +247,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XalanXPathException.cpp
Index: XalanXPathException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanXPathException.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanXPathException.cpp 4 Jan 2002 18:40:31 -0000 1.1
+++ XalanXPathException.cpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XalanXPathException::s_emptyString;
@@ -89,7 +93,7 @@
XalanXPathException::XalanXPathException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanNode* styleNode,
const XalanDOMString& theType) :
@@ -110,3 +114,7 @@
XalanXPathException::~XalanXPathException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XPath/XalanXPathException.hpp
Index: XalanXPathException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XalanXPathException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanXPathException.hpp 4 Jan 2002 18:40:31 -0000 1.1
+++ XalanXPathException.hpp 21 Nov 2002 01:26:18 -0000 1.2
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -109,7 +113,7 @@
* @param theType type of exception, default is "XalanXPathException"
*/
XalanXPathException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanNode* styleNode = 0,
const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
@@ -150,6 +154,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
