(file) Return to CIMQualifierRep.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/CIMQualifierRep.cpp between version 1.29 and 1.30

version 1.29, 2002/07/30 22:03:00 version 1.30, 2002/08/08 18:30:00
Line 48 
Line 48 
 CIMQualifierRep::CIMQualifierRep( CIMQualifierRep::CIMQualifierRep(
     const CIMName& name,     const CIMName& name,
     const CIMValue& value,     const CIMValue& value,
     Uint32 flavor,      const CIMFlavor & flavor,
     Boolean propagated)     Boolean propagated)
     :     :
     _name(name),     _name(name),
Line 71 
Line 71 
     _name = name;     _name = name;
 } }
  
 void CIMQualifierRep::resolveFlavor(Uint32 inheritedFlavor, Boolean inherited)  void CIMQualifierRep::resolveFlavor (
       const CIMFlavor & inheritedFlavor,
       Boolean inherited)
         {         {
                 // ATTN: KS P3 Needs more tests and expansion so we treate first different                 // ATTN: KS P3 Needs more tests and expansion so we treate first different
                 // from inheritance                 // from inheritance
  
                 // if the turnoff flags set, reset the functions.      // if the turnoff flags set, reset the flavor bits
                 if((inheritedFlavor & CIMFlavor::RESTRICTED) != 0) {      if (inheritedFlavor.hasFlavor (CIMFlavor::RESTRICTED))
                         unsetFlavor(CIMFlavor::TOSUBCLASS + CIMFlavor::TOINSTANCE);      {
           _flavor.removeFlavor (CIMFlavor::TOSUBCLASS | CIMFlavor::TOINSTANCE);
                 }                 }
                 if((inheritedFlavor & CIMFlavor::DISABLEOVERRIDE)) {      if (inheritedFlavor.hasFlavor (CIMFlavor::DISABLEOVERRIDE))
                         unsetFlavor(CIMFlavor::ENABLEOVERRIDE);      {
           _flavor.removeFlavor (CIMFlavor::ENABLEOVERRIDE);
                 }                 }
  
                 _flavor = inheritedFlavor | _flavor;      _flavor.addFlavor (inheritedFlavor);
         }         }
  
 static const char* _toString(Boolean x) static const char* _toString(Boolean x)
Line 183 
Line 187 
         this == x ||         this == x ||
         _name.equal(x->_name) &&         _name.equal(x->_name) &&
         _value == x->_value &&         _value == x->_value &&
         _flavor == x->_flavor &&          (_flavor.equal (x->_flavor)) &&
         _propagated == x->_propagated;         _propagated == x->_propagated;
 } }
  


Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2