You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@locus.apache.org on 2000/08/11 17:16:42 UTC
cvs commit: xml-xalan/c/src/XPath XPathExecutionContextDefault.cpp XPathExecutionContextDefault.hpp
dbertoni 00/08/11 08:16:42
Modified: c/src/XPath XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
Log:
Fixed bug with temporary passed as context node list.
Revision Changes Path
1.16 +6 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XPathExecutionContextDefault.cpp 2000/08/10 18:37:38 1.15
+++ XPathExecutionContextDefault.cpp 2000/08/11 15:16:42 1.16
@@ -76,19 +76,23 @@
+const NodeRefList XPathExecutionContextDefault::s_dummyList;
+
+
+
XPathExecutionContextDefault::XPathExecutionContextDefault(
XPathEnvSupport& theXPathEnvSupport,
XPathSupport& theXPathSupport,
XObjectFactory& theXObjectFactory,
XalanNode* theCurrentNode,
- const NodeRefListBase& theContextNodeList,
+ const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver) :
XPathExecutionContext(),
m_xpathEnvSupport(theXPathEnvSupport),
m_xpathSupport(theXPathSupport),
m_xobjectFactory(theXObjectFactory),
m_currentNode(theCurrentNode),
- m_contextNodeList(&theContextNodeList),
+ m_contextNodeList(theContextNodeList == 0 ? &s_dummyList : theContextNodeList),
m_prefixResolver(thePrefixResolver),
m_throwFoundIndex(false),
m_availableCachedNodeLists(),
1.17 +7 -1 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XPathExecutionContextDefault.hpp 2000/08/10 18:37:38 1.16
+++ XPathExecutionContextDefault.hpp 2000/08/11 15:16:42 1.17
@@ -82,6 +82,10 @@
+#include <XPath/NodeRefList.hpp>
+
+
+
class XPathEnvSupport;
@@ -109,7 +113,7 @@
XPathSupport& theXPathSupport,
XObjectFactory& theXObjectFactory,
XalanNode* theCurrentNode = 0,
- const NodeRefListBase& theContextNodeList = NodeRefList(),
+ const NodeRefListBase* theContextNodeList = 0,
const PrefixResolver* thePrefixResolver = 0);
virtual
@@ -345,6 +349,8 @@
XObjectArgVectorStackType m_argVectorsStack;
ArgVectorStackIteratorType m_argVectorsStackPosition;
+
+ static const NodeRefList s_dummyList;
};