dbertoni 00/07/12 14:49:25
Modified: c/src/TestXPath TestXPath.cpp
Log:
Update for changes to XObject, XPath, XObjectFactory, and XPathFactory.
Revision Changes Path
1.11 +16 -16 xml-xalan/c/src/TestXPath/TestXPath.cpp
Index: TestXPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/TestXPath/TestXPath.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestXPath.cpp 2000/07/10 01:06:13 1.10
+++ TestXPath.cpp 2000/07/12 21:49:24 1.11
@@ -420,8 +420,8 @@
{
XalanNode*
theResult = 0;
- FactoryObjectAutoPointer<XPath> theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+ theXPathFactory.create());
XalanElement* theNamespaceContext = 0;
ElementPrefixResolverProxy thePrefixResolver(theNamespaceContext,
theXPathEnvSupport, theXPathSupport);
@@ -519,8 +519,8 @@
ElementPrefixResolverProxy
thePrefixResolver(theNamespaceContext, theXPathEnvSupport, theXPathSupport);
NodeRefList
theContextNodeList;
- FactoryObjectAutoPointer<XPath>
theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+
theXPathFactory.create());
theXPathProcessor.initXPath(*theXPath.get(),
theXPathString,
@@ -634,8 +634,8 @@
ElementPrefixResolverProxy
thePrefixResolver(theNamespaceContext, theXPathEnvSupport, theXPathSupport);
NodeRefList
theContextNodeList;
- FactoryObjectAutoPointer<XPath>
theXPath1(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath1(theXPathFactory,
+
theXPathFactory.create());
theXPathProcessor.initXPath(*theXPath1.get(),
"following-sibling::*",
@@ -643,8 +643,8 @@
theXObjectFactory,
theXPathEnvSupport);
- FactoryObjectAutoPointer<XPath>
theXPath2(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath2(theXPathFactory,
+
theXPathFactory.create());
theXPathProcessor.initXPath(*theXPath2.get(),
"descendant::*",
@@ -816,8 +816,8 @@
for(int i = 0; theNumericTestInput[i] != 0; i++)
{
- FactoryObjectAutoPointer<XPath>
theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+
theXPathFactory.create());
TestNumericResult(theXPathProcessor,
*theXPath.get(),
@@ -937,8 +937,8 @@
for(int i = 0; theStringTestInput[i] != 0; i++)
{
- FactoryObjectAutoPointer<XPath>
theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+
theXPathFactory.create());
TestStringResult(theXPathProcessor,
*theXPath.get(),
@@ -1062,8 +1062,8 @@
for(int i = 0; theBooleanTestInput[i] != 0; i++)
{
- FactoryObjectAutoPointer<XPath>
theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+
theXPathFactory.create());
TestBooleanResult(theXPathProcessor,
*theXPath.get(),
@@ -1155,8 +1155,8 @@
// Get the name of the corresponding XSL file...
const XalanDOMString theXSLFileName =
GetXSLFileName(theXMLFileName);
- FactoryObjectAutoPointer<XPath>
theXPath(&theXPathFactory,
-
theXPathFactory.create());
+ XPathGuard theXPath(theXPathFactory,
+
theXPathFactory.create());
TestAxisResult(theXPathProcessor,
theXPathEnvSupport,
