cvs commit: xml-xalan/c/src/TestXSLT process.cpp

[dbertoni]

dbertoni    00/05/26 12:27:48

  Modified:    c/src/TestXSLT process.cpp
  Log:
  Removed multithreading option, removed call to obsolete XSLTEngineImpl member 
function, and fixed a problem with an auto_ptr.
  
  Revision  Changes    Path
  1.20      +17 -9     xml-xalan/c/src/TestXSLT/process.cpp
  
  Index: process.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/TestXSLT/process.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- process.cpp       2000/05/24 19:40:18     1.19
  +++ process.cpp       2000/05/26 19:27:38     1.20
  @@ -264,11 +264,6 @@
                        if(((i+1) < argc) && (argv[i+1][0] != '-'))
                                p.indentAmount = atoi( argv[++i] );
                } 
  -             else if (!stricmp("-MT", argv[i])) 
  -             {
  -                     if(((i+1) < argc) && (argv[i+1][0] != '-'))
  -                             p.nThreads = atoi( argv[++i] );
  -             } 
                else if (!stricmp("-IN", argv[i])) 
                {
                        p.inFileNames.push_back(argv[++i]);
  @@ -501,8 +496,6 @@
   
        theXSLProcessorSupport.setProcessor(&processor);
   
  -     processor.setFormatter(&xmlParserLiaison);
  -
   
        auto_ptr<TraceListener>         theTraceListener;
   
  @@ -511,12 +504,21 @@
                params.traceGenerationEvent == true ||
                params.traceSelectionEvent)
        {
  +#if defined(XALAN_OLD_AUTO_PTR)
                theTraceListener = auto_ptr<TraceListener>(new 
TraceListenerDefault(
                                diagnosticsWriter,
                                params.traceTemplates,
                                params.traceTemplateChildren,
                                params.traceGenerationEvent,
                                params.traceSelectionEvent));
  +#else
  +             theTraceListener.reset(new TraceListenerDefault(
  +                             diagnosticsWriter,
  +                             params.traceTemplates,
  +                             params.traceTemplateChildren,
  +                             params.traceGenerationEvent,
  +                             params.traceSelectionEvent));
  +#endif
   
                processor.setTraceSelects(params.traceSelectionEvent);
                processor.addTraceListener(theTraceListener.get());
  @@ -651,19 +653,25 @@
                        pthread_self();
   #else
                        0;
  -#endif                               
  -#endif                               
  +#endif
  +#endif
                        char buffer[16];
            sprintf(buffer, ".%d", pid);
            outputFileName += buffer;
                }
                if (! outputFileName.empty())   
                {
  +#if defined(XALAN_OLD_AUTO_PTR)
                        outputFileStream = 
                                auto_ptr<TextFileOutputStream>(new 
TextFileOutputStream(
                                                        
outputFileName.c_str()));
  +#else
  +                     outputFileStream.reset(new 
TextFileOutputStream(outputFileName.c_str()));
  +#endif
  +
                        outputStream = outputFileStream.get();
                }
  +
                XercesDOMPrintWriter    resultWriter(*outputStream);