auriemma    01/02/01 11:11:49

  Modified:    c/src/XalanTransformer XalanTransformerDefinitions.hpp
                        XalanTransformer.hpp XalanCAPI.cpp
  Log:
  Clean up for HP.
  
  Revision  Changes    Path
  1.4       +1 -1      
xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp
  
  Index: XalanTransformerDefinitions.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanTransformerDefinitions.hpp   2001/01/31 18:56:27     1.3
  +++ XalanTransformerDefinitions.hpp   2001/02/01 19:11:37     1.4
  @@ -79,4 +79,4 @@
   
   
   
  -#endif       // XALAN_TRANSFORMER_DEFINITIONS_HEADER_GUARD_1357924680
  \ No newline at end of file
  +#endif       // XALAN_TRANSFORMER_DEFINITIONS_HEADER_GUARD_1357924680
  
  
  
  1.4       +14 -3     xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
  
  Index: XalanTransformer.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanTransformer.hpp      2001/01/31 18:56:27     1.3
  +++ XalanTransformer.hpp      2001/02/01 19:11:40     1.4
  @@ -93,7 +93,11 @@
   
   
   
  +#if defined(XALAN_OLD_STREAM_HEADERS)
  +#include <iostream.h>
  +#else
   #include <iostream>
  +#endif
   
   
   
  @@ -195,7 +199,7 @@
         * @return      0 for success and 1 for failure 
         */
        int
  -     XalanTransformer::transform(
  +     transform(
                        istream*                                        
theXMLInStream, 
                        istream*                                        
theXSLInStream,
                        ostream*                                        
theOutStream);
  @@ -216,7 +220,7 @@
         * @return      0 for success and 1 for failure 
         */
        int
  -     XalanTransformer::transform(
  +     transform(
                        const char*                                     
theXMLFileName, 
                        const char*                                     
theXSLFileName,
                        const void*                                     
theOutputHandle, 
  @@ -227,12 +231,19 @@
   private:
   
        XalanSourceTreeDOMSupport                               m_domSupport;
  +
        XalanSourceTreeParserLiaison                    m_parserLiaison;
  +     
        XSLTProcessorEnvSupportDefault                  
m_xsltprocessorEnvSupport;
  +     
        XObjectFactoryDefault                                   
m_xobjectFactory;
  +     
        XPathFactoryDefault                                             
m_xpathFactory;
  +     
        XSLTEngineImpl                                                  
m_processor;
  +     
        StylesheetConstructionContextDefault    m_stylesheetConstructionContext;
  +     
        StylesheetExecutionContextDefault               
m_stylesheetExecutionContext;
   
        static XSLTInit*        m_xsltInit;
  @@ -240,4 +251,4 @@
   
   
   
  -#endif       // XALAN_TRANSFORMER_HEADER_GUARD
  \ No newline at end of file
  +#endif       // XALAN_TRANSFORMER_HEADER_GUARD
  
  
  
  1.4       +10 -8     xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp
  
  Index: XalanCAPI.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanCAPI.cpp     2001/01/31 18:56:28     1.3
  +++ XalanCAPI.cpp     2001/02/01 19:11:42     1.4
  @@ -59,7 +59,11 @@
   
   
   
  +#if defined(XALAN_OLD_STREAM_HEADERS)
  +#include <strstream.h>
  +#else
   #include <strstream>
  +#endif
   
   
   
  @@ -89,12 +93,13 @@
   
   
   XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
  -DeleteXalanTransformer(XalanHandle* theXalanTransformer)
  +DeleteXalanTransformer(XalanHandle* theXalanHandle)
   {
  -     if(theXalanTransformer != NULL)
  +     if(*theXalanHandle != NULL)
        {
  -             delete  *theXalanTransformer;
  -             *theXalanTransformer = NULL;
  +             XalanTransformer* theXalanTransformer = (XalanTransformer*) 
*theXalanHandle;
  +             delete  theXalanTransformer;
  +             *theXalanHandle = NULL;
        }
   }
   
  @@ -158,7 +163,7 @@
   XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
   XalanFreeData(char** theStream)
   {
  -     if(theStream != NULL)
  +     if(*theStream != NULL)
        {
                delete[] *theStream;
                *theStream = NULL;
  @@ -187,6 +192,3 @@
   
        return status;
   }
  -
  -
  -
  
  
  

Reply via email to