dbertoni    01/08/05 19:16:50

  Modified:    c/src/XPath SimpleNodeLocator.cpp
  Log:
  Added & to member functions.
  
  Revision  Changes    Path
  1.43      +17 -17    xml-xalan/c/src/XPath/SimpleNodeLocator.cpp
  
  Index: SimpleNodeLocator.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/SimpleNodeLocator.cpp,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- SimpleNodeLocator.cpp     2001/08/06 01:39:29     1.42
  +++ SimpleNodeLocator.cpp     2001/08/06 02:16:50     1.43
  @@ -1917,21 +1917,21 @@
        switch(theExpression.getOpCodeMapValue(opPos))
        {
        case XPathExpression::eNODETYPE_COMMENT:
  -             m_testFunction = NodeTester::testComment;
  +             m_testFunction = &NodeTester::testComment;
                break;
   
        case XPathExpression::eNODETYPE_TEXT:
  -             m_testFunction = NodeTester::testText;
  +             m_testFunction = &NodeTester::testText;
                break;
   
        case XPathExpression::eNODETYPE_PI:
                if (argLen == 1)
                {
  -                     m_testFunction = NodeTester::testPI;
  +                     m_testFunction = &NodeTester::testPI;
                }
                else if(argLen == 2)
                {
  -                     m_testFunction = NodeTester::testPIName;
  +                     m_testFunction = &NodeTester::testPIName;
   
                        m_targetLocalName = getStringFromTokenQueue(
                                theExpression,
  @@ -1944,11 +1944,11 @@
                break;
   
        case XPathExpression::eNODETYPE_NODE:
  -             m_testFunction = NodeTester::testNode;
  +             m_testFunction = &NodeTester::testNode;
                break;
   
        case XPathExpression::eNODETYPE_ROOT:
  -             m_testFunction = NodeTester::testRoot;
  +             m_testFunction = &NodeTester::testRoot;
                break;
   
        case XPathExpression::eNODENAME:
  @@ -1975,67 +1975,67 @@
                        {
                                if (isTotallyWild == true)
                                {
  -                                     m_testFunction = 
NodeTester::testAttributeTotallyWild;
  +                                     m_testFunction = 
&NodeTester::testAttributeTotallyWild;
                                }
                                else if (m_targetNamespace == 0)
                                {
                                        assert(m_targetLocalName != 0);
   
  -                                     m_testFunction = 
NodeTester::testAttributeNCName;
  +                                     m_testFunction = 
&NodeTester::testAttributeNCName;
                                }
                                else if (m_targetLocalName == 0)
                                {
                                        assert(m_targetNamespace != 0);
   
  -                                     m_testFunction = 
NodeTester::testAttributeNamespaceOnly;
  +                                     m_testFunction = 
&NodeTester::testAttributeNamespaceOnly;
                                }
                                else
                                {
                                        assert(m_targetNamespace != 0 && 
m_targetLocalName != 0);
   
   
  -                                     m_testFunction = 
NodeTester::testAttributeQName;
  +                                     m_testFunction = 
&NodeTester::testAttributeQName;
                                }
                        }
                        else if (stepType == XPathExpression::eFROM_NAMESPACE)
                        {
                                if (isTotallyWild == true)
                                {
  -                                     m_testFunction = 
NodeTester::testNamespaceTotallyWild;
  +                                     m_testFunction = 
&NodeTester::testNamespaceTotallyWild;
                                }
                                else
                                {
  -                                     m_testFunction = 
NodeTester::testNamespaceNCName;
  +                                     m_testFunction = 
&NodeTester::testNamespaceNCName;
                                }
                        }
                        else
                        {
                                if (isTotallyWild == true)
                                {
  -                                     m_testFunction = 
NodeTester::testElementTotallyWild;
  +                                     m_testFunction = 
&NodeTester::testElementTotallyWild;
                                }
                                else if (m_targetNamespace == 0)
                                {
  -                                     m_testFunction = 
NodeTester::testElementNCName;
  +                                     m_testFunction = 
&NodeTester::testElementNCName;
                                }
                                else if (m_targetLocalName == 0)
                                {
                                        assert(m_targetNamespace != 0);
   
  -                                     m_testFunction = 
NodeTester::testElementNamespaceOnly;
  +                                     m_testFunction = 
&NodeTester::testElementNamespaceOnly;
                                }
                                else
                                {
                                        assert(m_targetNamespace != 0 && 
m_targetLocalName != 0);
   
  -                                     m_testFunction = 
NodeTester::testElementQName;
  +                                     m_testFunction = 
&NodeTester::testElementQName;
                                }
                        }
                }
                break;
   
        default:
  -             m_testFunction = NodeTester::testDefault;
  +             m_testFunction = &NodeTester::testDefault;
                break;
        }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to