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

[dbertoni]

dbertoni    2002/11/25 14:02:54

  Modified:    c/src/TestXPath NodeNameTreeWalker.hpp TestXPath.cpp
  Log:
  Updated #ifdefs.
  
  Revision  Changes    Path
  1.5       +1 -1      xml-xalan/c/src/TestXPath/NodeNameTreeWalker.hpp
  
  Index: NodeNameTreeWalker.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/TestXPath/NodeNameTreeWalker.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NodeNameTreeWalker.hpp    22 Nov 2002 02:28:00 -0000      1.4
  +++ NodeNameTreeWalker.hpp    25 Nov 2002 22:02:53 -0000      1.5
  @@ -79,7 +79,7 @@
   {
   public:
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef vector<XalanNode*>                      NodeVectorType;
   #else
        typedef std::vector<XalanNode*>         NodeVectorType;
  
  
  
  1.37      +3 -4      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- TestXPath.cpp     22 Nov 2002 02:28:00 -0000      1.36
  +++ TestXPath.cpp     25 Nov 2002 22:02:53 -0000      1.37
  @@ -1198,6 +1198,7 @@
   {
        const XalanDOMString    
theProtocol(XALAN_STATIC_UCODE_STRING("file://"));
        const XalanDOMString    theBaseURL = theProtocol + theDirectory;
  +
   #if defined(WIN32)
        const XalanDOMString    theSearchSpecification(theDirectory + "\\*");
   #else
  @@ -1205,7 +1206,7 @@
   #endif
        const XalanDOMString    theXMLSuffix(XALAN_STATIC_UCODE_STRING(".xml"));
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef vector<XalanDOMString>          FileNameVectorType;
   #else
        typedef std::vector<XalanDOMString>     FileNameVectorType;
  @@ -1303,9 +1304,7 @@
   main(int                     /* argc */,
         const char*    /* argv */ [])
   {
  -#if !defined (XALAN_NO_NAMESPACES)
  -     using std::cout;
  -#endif
  +     XALAN_USING_STD(cout)
   
   #if !defined(NDEBUG) && defined(_MSC_VER)
        _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | 
_CRTDBG_LEAK_CHECK_DF);
  
  
  

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