(file) Return to CMPI_Value.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / CMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp between version 1.18 and 1.18.8.3

version 1.18, 2005/08/06 00:24:39 version 1.18.8.3, 2006/04/11 15:50:45
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 165 
Line 167 
    }    }
    else if (type ==CMPI_instance)    else if (type ==CMPI_instance)
         {         {
                 v.set(*((CIMInstance*) data->inst->hdl));                  v.set(*((CIMObject*) data->inst->hdl));
         }         }
    else switch (type) {    else switch (type) {
       case CMPI_ref:      v.set(*((CIMObjectPath*)data->ref->hdl)); break;       case CMPI_ref:      v.set(*((CIMObjectPath*)data->ref->hdl)); break;
Line 286 
Line 288 
          data->value.ref=(CMPIObjectPath*)new CMPI_Object(new CIMObjectPath(ref));          data->value.ref=(CMPIObjectPath*)new CMPI_Object(new CIMObjectPath(ref));
       }       }
       break;       break;
      case CMPI_instance: {
            CIMInstance inst;
            if(v.getType() == CIMTYPE_OBJECT)
            {
              CIMObject tmpObj;
              v.get(tmpObj);
              inst = CIMInstance(tmpObj);
            }
            else
            {
   #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
                v.get(inst);
   #else
                return CMPI_RC_ERR_NOT_SUPPORTED;
   #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
            }
   
            data->value.inst=(CMPIInstance*)new CMPI_Object(new CIMInstance(inst));
         }
         break;
    case CMPI_dateTime: {    case CMPI_dateTime: {
          CIMDateTime dt;          CIMDateTime dt;
          v.get(dt);          v.get(dt);
Line 319 
Line 341 
         CMPI_string,     // STRING,         CMPI_string,     // STRING,
         CMPI_dateTime,   // DATETIME,         CMPI_dateTime,   // DATETIME,
         CMPI_ref,        // REFERENCE         CMPI_ref,        // REFERENCE
           CMPI_instance    // Embedded Object
   #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
           , CMPI_instance  // Embedded Instance
   #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
     };     };
     int t=types[pt];     int t=types[pt];
     if (array) t|=CMPI_ARRAY;     if (array) t|=CMPI_ARRAY;

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