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

[dbertoni]

dbertoni    01/08/20 15:20:03

  Modified:    c/src/XalanTransformer XalanTransformer.cpp
                        XalanTransformer.hpp
  Log:
  Fixed const problems for AIX.
  
  Revision  Changes    Path
  1.29      +9 -1      xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
  
  Index: XalanTransformer.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- XalanTransformer.cpp      2001/08/20 15:20:03     1.28
  +++ XalanTransformer.cpp      2001/08/20 22:20:03     1.29
  @@ -113,7 +113,7 @@
   
   
   
  -XSLTInit*    XalanTransformer::s_xsltInit = 0;
  +const XSLTInit*              XalanTransformer::s_xsltInit = 0;
   
   #if defined(XALAN_USE_ICU)
   static const ICUBridgeCollationCompareFunctor*       theICUFunctor = 0;
  @@ -186,12 +186,20 @@
   XalanTransformer::terminate()
   {
        // Terminate Xalan and release memory.
  +#if defined(XALAN_CANNOT_DELETE_CONST)
  +     (XSLTInit*) s_xsltInit;
  +#else
        delete s_xsltInit;
  +#endif
   
        s_xsltInit = 0;
   
   #if defined(XALAN_USE_ICU)
  +#if defined(XALAN_CANNOT_DELETE_CONST)
  +     delete (ICUBridgeCollationCompareFunctor*)theICUFunctor;
  +#else
        delete theICUFunctor;
  +#endif
   
        theICUFunctor = 0;
   #endif
  
  
  
  1.30      +1 -1      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- XalanTransformer.hpp      2001/08/16 14:44:58     1.29
  +++ XalanTransformer.hpp      2001/08/20 22:20:03     1.30
  @@ -541,7 +541,7 @@
   
        StylesheetExecutionContextDefault*              m_stylesheetExecutionContext;
   
  -     static XSLTInit*                                                s_xsltInit;
  +     static const XSLTInit*                                  s_xsltInit;
   };
   
   #endif       // XALANTRANSFORMER_HEADER_GUARD
  
  
  

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