cvs commit: xml-xerces/c/src/xercesc/dom/impl DOMConfigurationImpl.cpp DOMConfigurationImpl.hpp

[gareth]

gareth      2003/10/20 05:12:44

  Modified:    c/src/xercesc/dom/impl DOMConfigurationImpl.cpp
                        DOMConfigurationImpl.hpp
  Log:
  removed use of new without memory manager.
  
  Revision  Changes    Path
  1.6       +6 -6      xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
  
  Index: DOMConfigurationImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMConfigurationImpl.cpp  15 May 2003 09:11:50 -0000      1.5
  +++ DOMConfigurationImpl.cpp  20 Oct 2003 12:12:44 -0000      1.6
  @@ -63,6 +63,9 @@
   
   XERCES_CPP_NAMESPACE_BEGIN
   
  +const bool DOMConfigurationImpl::fFalse = false;
  +const bool DOMConfigurationImpl::fTrue = true;
  +
   /* canonical-form */
   const XMLCh DOMConfigurationImpl::fgCANONICAL_FORM[] = { chLatin_c, chLatin_a, 
chLatin_n, chLatin_o, chLatin_n, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chDash, 
chLatin_f, chLatin_o, chLatin_r, chLatin_m, chNull };
   
  @@ -116,14 +119,11 @@
   
   const unsigned short DOMConfigurationImpl::fDEFAULT_VALUES = 0x2596;
   
  -DOMConfigurationImpl::DOMConfigurationImpl(): featureValues(fDEFAULT_VALUES), 
fTrue(new bool(true)), 
  -                                              fFalse(new bool(false)),
  +DOMConfigurationImpl::DOMConfigurationImpl(): featureValues(fDEFAULT_VALUES),
                                                 fErrorHandler(0), fSchemaType(0), 
fSchemaLocation(0) {
   }
   
   DOMConfigurationImpl::~DOMConfigurationImpl() {
  -    delete (bool*)fTrue;
  -    delete (bool*)fFalse;
   }
                                           
   void DOMConfigurationImpl::setParameter(const XMLCh* name, const void* value) {
  @@ -183,9 +183,9 @@
   
       if(isBooleanParameter){
           if(featureValues & whichFlag) {
  -            return fTrue;
  +            return &fTrue;
           } else {
  -            return fFalse;
  +            return &fFalse;
           }
       } else {
           if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
  
  
  
  1.5       +2 -2      xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
  
  Index: DOMConfigurationImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DOMConfigurationImpl.hpp  15 May 2003 09:11:50 -0000      1.4
  +++ DOMConfigurationImpl.hpp  20 Oct 2003 12:12:44 -0000      1.5
  @@ -194,8 +194,8 @@
       // the schema location
       const XMLCh* fSchemaLocation;
   
  -    const bool* fFalse;
  -    const bool* fTrue;
  +    static const bool fFalse;
  +    static const bool fTrue;
   };
   
   XERCES_CPP_NAMESPACE_END
  
  
  

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