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

Diff for /pegasus/src/Pegasus/Common/CIMQualifierList.cpp between version 1.67 and 1.68

version 1.67, 2008/10/01 04:46:17 version 1.68, 2008/10/30 17:28:50
Line 126 
Line 126 
     CIMScope scope, // Scope of the entity being resolved.     CIMScope scope, // Scope of the entity being resolved.
     Boolean isInstancePart,     Boolean isInstancePart,
     CIMQualifierList& inheritedQualifiers,     CIMQualifierList& inheritedQualifiers,
     Boolean propagateQualifiers)  // Apparently not used ks 24 mar 2002      Boolean propagateQualifiers)
 { {
     _keyIndex = PEGASUS_ORDEREDSET_INDEX_UNKNOWN;     _keyIndex = PEGASUS_ORDEREDSET_INDEX_UNKNOWN;
  
Line 296 
Line 296 
     // already have those qualifiers:     // already have those qualifiers:
     //--------------------------------------------------------------------------     //--------------------------------------------------------------------------
  
       if (propagateQualifiers)
       {
     for (Uint32 i = 0, n = inheritedQualifiers.getCount(); i < n; i++)     for (Uint32 i = 0, n = inheritedQualifiers.getCount(); i < n; i++)
     {     {
         CIMQualifier iq = inheritedQualifiers.getQualifier(i);         CIMQualifier iq = inheritedQualifiers.getQualifier(i);
  
         if (isInstancePart)         if (isInstancePart)
         {         {
             if (!(iq.getFlavor ().hasFlavor                  if (!(iq.getFlavor().hasFlavor(CIMFlavor::TOINSTANCE)))
                   (CIMFlavor::TOINSTANCE)))  
                 continue;                 continue;
         }         }
         else         else
         {         {
             if (!(iq.getFlavor ().hasFlavor                  if (!(iq.getFlavor().hasFlavor(CIMFlavor::TOSUBCLASS)))
                   (CIMFlavor::TOSUBCLASS)))  
                 continue;                 continue;
         }         }
  
         // If the qualifiers list does not already contain this qualifier,         // If the qualifiers list does not already contain this qualifier,
         // then propagate it (and set the propagated flag to true).  Else we              // then propagate it (and set the propagated flag to true).  Else
         // keep current value. Note we have already eliminated any possibity              // we keep current value. Note we have already eliminated any
         // that a nonoverridable qualifier can be in the list.              // possibility that a nonoverridable qualifier can be in the list.
         // Note that there is no exists() function ATTN:KS 25 Mar 2002  
         if (find(iq.getName()) != PEG_NOT_FOUND)         if (find(iq.getName()) != PEG_NOT_FOUND)
             continue;             continue;
  
Line 325 
Line 324 
         q.setPropagated(true);         q.setPropagated(true);
         _qualifiers.insert(0, q);         _qualifiers.insert(0, q);
     }     }
       }
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  


Legend:
Removed from v.1.67  
changed lines
  Added in v.1.68

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2