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

Diff for /pegasus/src/Pegasus/Common/CIMClassRep.cpp between version 1.55 and 1.56

version 1.55, 2002/08/27 23:38:44 version 1.56, 2002/09/13 21:40:42
Line 105 
Line 105 
     // Reject addition of duplicate property name:     // Reject addition of duplicate property name:
  
     if (findProperty(x.getName()) != PEG_NOT_FOUND)     if (findProperty(x.getName()) != PEG_NOT_FOUND)
         throw AlreadyExistsException("property \"" + x.getName() + "\"");          throw AlreadyExistsException
               ("property \"" + x.getName().getString () + "\"");
  
     // Set the class origin:     // Set the class origin:
     // ATTN: put this check in other places:     // ATTN: put this check in other places:
Line 126 
Line 127 
     // Reject duplicate method names:     // Reject duplicate method names:
  
     if (findMethod(x.getName()) != PEG_NOT_FOUND)     if (findMethod(x.getName()) != PEG_NOT_FOUND)
         throw AlreadyExistsException("method \"" + x.getName() + "\"");          throw AlreadyExistsException
               ("method \"" + x.getName().getString() + "\"");
  
     // Add the method:     // Add the method:
  
Line 179 
Line 181 
  
         PEG_TRACE_STRING(TRC_OBJECTRESOLUTION, Tracer::LEVEL3,         PEG_TRACE_STRING(TRC_OBJECTRESOLUTION, Tracer::LEVEL3,
                 String("CIMClassRep::resolve  class = ") +                 String("CIMClassRep::resolve  class = ") +
                 _reference.getClassName() + ", superclass = " +                  _reference.getClassName().getString() + ", superclass = " +
                 _superClassName);                  _superClassName.getString());
  
     if (!_superClassName.isNull())     if (!_superClassName.isNull())
         {         {
Line 193 
Line 195 
                         = context->lookupClass(nameSpace, _superClassName);                         = context->lookupClass(nameSpace, _superClassName);
  
                 if (superClass.isUninitialized())                 if (superClass.isUninitialized())
                         throw PEGASUS_CIM_EXCEPTION(CIM_ERR_INVALID_SUPERCLASS,_superClassName);                          throw PEGASUS_CIM_EXCEPTION(CIM_ERR_INVALID_SUPERCLASS,
                               _superClassName.getString());
  
 #if 0 #if 0
                 if (!superClass._rep->_resolved)                 if (!superClass._rep->_resolved)
Line 554 
Line 557 
     if (!tmprep)     if (!tmprep)
         return false;         return false;
  
     if (_superClassName != tmprep->_superClassName)      if (!_superClassName.equal (tmprep->_superClassName))
         return false;         return false;
  
     //     //
Line 573 
Line 576 
             if (!tmp1[i].identical(tmp2[i]))             if (!tmp1[i].identical(tmp2[i]))
                 return false;                 return false;
  
             if (tmp1[i].getClassOrigin() != tmp2[i].getClassOrigin())              if (!tmp1[i].getClassOrigin().equal (tmp2[i].getClassOrigin()))
                 return false;                 return false;
  
             if (tmp1[i].getPropagated() != tmp2[i].getPropagated())             if (tmp1[i].getPropagated() != tmp2[i].getPropagated())
Line 596 
Line 599 
         CIMConstProperty property = getProperty(i);         CIMConstProperty property = getProperty(i);
  
         Uint32 index;         Uint32 index;
         if ((index = property.findQualifier ("key")) != PEG_NOT_FOUND)          if ((index = property.findQualifier (CIMName ("key"))) != PEG_NOT_FOUND)
         {         {
             CIMValue value;             CIMValue value;
             value = property.getQualifier (index).getValue ();             value = property.getQualifier (index).getValue ();
Line 618 
Line 621 
         CIMConstProperty property = getProperty(i);         CIMConstProperty property = getProperty(i);
  
         Uint32 index;         Uint32 index;
         if ((index = property.findQualifier ("key")) != PEG_NOT_FOUND)          if ((index = property.findQualifier (CIMName ("key"))) != PEG_NOT_FOUND)
         {         {
             CIMValue value;             CIMValue value;
             value = property.getQualifier (index).getValue ();             value = property.getQualifier (index).getValue ();

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2