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

[auriemma]

auriemma    00/09/21 09:44:56

  Modified:    c/src/XercesParserLiaison XercesParserLiaison.cpp
  Log:
  Resolve scope for AIX.
  
  Revision  Changes    Path
  1.19      +44 -3     
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
  
  Index: XercesParserLiaison.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- XercesParserLiaison.cpp   2000/09/19 14:47:38     1.18
  +++ XercesParserLiaison.cpp   2000/09/21 16:44:56     1.19
  @@ -440,16 +440,29 @@
        using std::endl;
   #endif
   
  +#if defined(XALAN_OSTREAM_HAS_WCHAR_T)
        cerr << endl
  +              << "Fatal Error at (file ";
  +     OutputString(cerr, e.getSystemId());
  +     cerr << ", line "
  +              << e.getLineNumber()
  +              << ", char"
  +              << e.getColumnNumber()
  +              << "): ";
  +        OutputString(cerr, e.getMessage());           
  +     cerr <<  endl;
  +#else
  +     cerr << endl
                 << "Fatal Error at (file "
                 << e.getSystemId()
                 << ", line "
                 << e.getLineNumber()
                 << ", char"
                 << e.getColumnNumber()
  -         << "): "
  +              << "): "
                 << e.getMessage()
                 << endl;
  +#endif                        
   
        throw e;
   }
  @@ -464,6 +477,18 @@
        using std::endl;
   #endif
   
  +#if defined(XALAN_OSTREAM_HAS_WCHAR_T)
  +     cerr << endl
  +              << "Error at (file ";
  +     OutputString(cerr, e.getSystemId());
  +     cerr << ", line "
  +              << e.getLineNumber()
  +              << ", char"
  +              << e.getColumnNumber()
  +              << "): ";
  +        OutputString(cerr, e.getMessage());           
  +     cerr <<  endl;
  +#else
        cerr << endl
                 << "Error at (file "
                 << e.getSystemId()
  @@ -471,9 +496,11 @@
                 << e.getLineNumber()
                 << ", char"
                 << e.getColumnNumber()
  -         << "): "
  +              << "): "
                 << e.getMessage()
                 << endl;
  +#endif
  +
   }
   
   
  @@ -486,16 +513,30 @@
        using std::endl;
   #endif
   
  +#if defined(XALAN_OSTREAM_HAS_WCHAR_T)
        cerr << endl
  +              << "Warning at (file ";
  +     OutputString(cerr, e.getSystemId());
  +     cerr << ", line "
  +              << e.getLineNumber()
  +              << ", char"
  +              << e.getColumnNumber()
  +              << "): ";
  +        OutputString(cerr, e.getMessage());           
  +     cerr <<  endl;
  +#else
  +     cerr << endl
                 << "Warning at (file "
                 << e.getSystemId()
                 << ", line "
                 << e.getLineNumber()
                 << ", char"
                 << e.getColumnNumber()
  -         << "): "
  +              << "): "
                 << e.getMessage()
                 << endl;
  +#endif
  +     
   }