dbertoni 01/04/12 12:00:31
Modified: c/src/XPath XPath.cpp
Log:
Removed some agressive asserts so TestXPath works again.
Revision Changes Path
1.49 +2 -7 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- XPath.cpp 2001/04/11 02:21:50 1.48
+++ XPath.cpp 2001/04/12 19:00:30 1.49
@@ -141,7 +141,6 @@
const XObjectPtr
XPath::execute(XPathExecutionContext& executionContext) const
{
- assert(executionContext.getCurrentNode() != 0);
assert(executionContext.getPrefixResolver() != 0);
return executeMore(executionContext.getCurrentNode(), 0,
executionContext);
@@ -155,8 +154,6 @@
const PrefixResolver& prefixResolver,
XPathExecutionContext& executionContext) const
{
- assert(context != 0);
-
// Push and pop the PrefixResolver...
XPathExecutionContext::PrefixResolverSetAndRestore
theResolverSetAndRestore(
executionContext,
@@ -179,8 +176,6 @@
const NodeRefListBase& contextNodeList,
XPathExecutionContext& executionContext) const
{
- assert(context != 0);
-
// Push and pop the PrefixResolver...
XPathExecutionContext::ContextNodeListSetAndRestore
theSetAndRestore(
executionContext,
@@ -197,8 +192,6 @@
int opPos,
XPathExecutionContext& executionContext) const
{
- assert(context != 0);
-
switch(m_expression.m_opMap[opPos])
{
case XPathExpression::eOP_XPATH:
@@ -350,6 +343,8 @@
XPathExecutionContext& executionContext,
double& score) const
{
+ assert(context != 0);
+
int opPos = 2;
XLocator* const locator = m_defaultXLocator;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
