cvs commit: xml-xalan/c/src/TestXPath TestXPath.cpp

[dbertoni]

dbertoni    00/04/20 09:42:53

  Modified:    c/src/TestXPath TestXPath.cpp
  Log:
  Fixed namespace problems.
  
  Revision  Changes    Path
  1.8       +10 -2     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestXPath.cpp     2000/04/11 21:33:29     1.7
  +++ TestXPath.cpp     2000/04/20 16:42:52     1.8
  @@ -359,7 +359,7 @@
        theTreeWalker.findMatchingNodes(theNodeName,
                                                                        
theStartNode);
   
  -     const std::vector<XalanNode*>&  theMatchingNodes =
  +     const NodeNameTreeWalker::NodeVectorType&       theMatchingNodes =
                        theTreeWalker.getMatchingNodes();
   
        if (theMatchingNodes.size() == 1)
  @@ -1142,7 +1142,11 @@
        const XalanDOMString            theSearchSpecification(theDirectory);
        const XalanDOMString            
theXMLSuffix(XALAN_STATIC_UCODE_STRING(".xml"));
   
  +#if defined(XALAN_NO_NAMESPACES)
  +     typedef vector<XalanDOMString>          FileNameVectorType;
  +#else
        typedef std::vector<XalanDOMString>     FileNameVectorType;
  +#endif
   
        DirectoryEnumeratorFunctor<FileNameVectorType>  theEnumerator;
   
  @@ -1228,6 +1232,10 @@
   main(int                     /* argc */,
         const char*    /* argv[] */)
   {
  +#if !defined (XALAN_NO_NAMESPACES)
  +     using std::cout;
  +#endif
  +
        XMLPlatformUtils::Initialize();
   
        XPathEnvSupportDefault          theXPathEnvSupport;
  @@ -1237,7 +1245,7 @@
        XPathFactoryDefault                     theXPathFactory;
        XPathProcessorImpl                      theXPathProcessor;
   
  -     XercesStdTextOutputStream       theStdOut(std::cout);
  +     XercesStdTextOutputStream       theStdOut(cout);
        XercesDOMPrintWriter            thePrintWriter(theStdOut);
        XercesParserLiaison                     theLiaison(theDOMSupport);