You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/02/12 18:07:10 UTC

cvs commit: xml-xalan/c/src/XPath XPathEnvSupportDefault.cpp

dbertoni    01/02/12 09:07:10

  Modified:    c/src/XPath XPathEnvSupportDefault.cpp
  Log:
  Make sure to check the global function table as well as the local one.
  
  Revision  Changes    Path
  1.23      +6 -13     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- XPathEnvSupportDefault.cpp	2000/11/30 19:40:58	1.22
  +++ XPathEnvSupportDefault.cpp	2001/02/12 17:07:08	1.23
  @@ -349,21 +349,14 @@
   	}
   	else
   	{
  -		// See if there's a table for that namespace...
  -		const NamespaceFunctionTablesType::const_iterator	i =
  -			m_externalFunctions.find(theNamespace);
  +		const Function* const	theFunction =
  +			findFunction(
  +				theNamespace,
  +				functionName);
   
  -		if (i != m_externalFunctions.end())
  +		if (theFunction != 0)
   		{
  -			// There is a table for the namespace,
  -			// so look for the function...
  -			const FunctionTableType::const_iterator		j =
  -				(*i).second.find(functionName);
  -
  -			if (j != (*i).second.end())
  -			{
  -				theResult = true;
  -			}
  +			theResult = true;
   		}
   	}