(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.24.4.2 and 1.25

version 1.24.4.2, 2008/07/04 09:01:38 version 1.25, 2007/02/15 03:45:43
Line 31 
Line 31 
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 //NOCHKSRC  
   
 #include "CMPI_Version.h" #include "CMPI_Version.h"
  
 #include "CMPI_String.h" #include "CMPI_String.h"
Line 93 
Line 91 
          }          }
       }       }
  
       else if (aType==CMPI_chars)       CopyToStringArray(String,string->hdl)        else if (aType==CMPI_chars)       CopyToStringArray(String,chars)
       else if (aType==CMPI_charsptr)    CopyCharsptrToStringArray(String,chars)       else if (aType==CMPI_charsptr)    CopyCharsptrToStringArray(String,chars)
       else if (aType==CMPI_string)      CopyToStringArray(String,string->hdl)       else if (aType==CMPI_string)      CopyToStringArray(String,string->hdl)
  
Line 111 
Line 109 
          case CMPI_ref:      CopyToEncArray(CIMObjectPath,ref); break;          case CMPI_ref:      CopyToEncArray(CIMObjectPath,ref); break;
          case CMPI_dateTime: CopyToEncArray(CIMDateTime,dateTime); break;          case CMPI_dateTime: CopyToEncArray(CIMDateTime,dateTime); break;
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
          case CMPI_instance: CopyToEncArray(CIMObject,inst); break;           case CMPI_instance: CopyToEncArray(CIMInstance,inst); break;
 #endif #endif
          case CMPI_boolean:  CopyToArray(Boolean,boolean); break;          case CMPI_boolean:  CopyToArray(Boolean,boolean); break;
          case CMPI_char16:   CopyToArray(Char16,char16); break;          case CMPI_char16:   CopyToArray(Char16,char16); break;
Line 247 
Line 245 
          case CMPI_ref:      CopyFromEncArray(CIMObjectPath,CMPIObjectPath,ref); break;          case CMPI_ref:      CopyFromEncArray(CIMObjectPath,CMPIObjectPath,ref); break;
          case CMPI_dateTime: CopyFromEncArray(CIMDateTime,CMPIDateTime,dateTime); break;          case CMPI_dateTime: CopyFromEncArray(CIMDateTime,CMPIDateTime,dateTime); break;
 #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
          case CMPI_instance:           case CMPI_instance: CopyFromEncArray(CIMInstance,CMPIInstance,inst); break;
              if (v.getType() == CIMTYPE_OBJECT)  
              {  
                  Array<CIMObject> tmpObjs;  
                  v.get(tmpObjs);  
                  for (int i = 0; i < aSize ; ++i)  
                  {  
                      aData[i].value.inst = reinterpret_cast<CMPIInstance*>(  
                            new CMPI_Object(new CIMInstance(tmpObjs[i])));  
                  }  
              }  
              else  
              {  
                   CopyFromEncArray(CIMInstance,CMPIInstance,inst);  
              }  
              break;  
 #endif #endif
          case CMPI_boolean:  CopyFromArray(Boolean,boolean); break;          case CMPI_boolean:  CopyFromArray(Boolean,boolean); break;
          case CMPI_char16:   CopyFromArray(Char16,char16); break;          case CMPI_char16:   CopyFromArray(Char16,char16); break;
          case CMPI_real32:   CopyFromArray(Real32,real32); break;          case CMPI_real32:   CopyFromArray(Real32,real32); break;
          case CMPI_real64:   CopyFromArray(Real64,real64); break;          case CMPI_real64:   CopyFromArray(Real64,real64); break;
          default:          default:
                // Not supported for this CMPItype
                delete [] aData;
          return CMPI_RC_ERR_NOT_SUPPORTED;          return CMPI_RC_ERR_NOT_SUPPORTED;
       }       }
       data->value.array=reinterpret_cast<CMPIArray*>(new CMPI_Object(aData-1));       data->value.array=reinterpret_cast<CMPIArray*>(new CMPI_Object(aData-1));

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