From: <ba...@us...> - 2007-03-28 00:30:21
|
Revision: 448 http://svn.sourceforge.net/omc/?rev=448&view=rev Author: bartw Date: 2007-03-27 17:30:21 -0700 (Tue, 27 Mar 2007) Log Message: ----------- regenerated code with newer cimple Modified Paths: -------------- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/repository.cpp Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_Component_GroupComponent; @@ -27,6 +27,7 @@ "GroupComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_Component,GroupComponent) }; @@ -42,14 +43,15 @@ "PartComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_Component,PartComponent) }; static Meta_Feature* _CIM_Component_MFA[] = { - (Meta_Feature*)&_CIM_Component_GroupComponent, - (Meta_Feature*)&_CIM_Component_PartComponent, + (Meta_Feature*)(void*)&_CIM_Component_GroupComponent, + (Meta_Feature*)(void*)&_CIM_Component_PartComponent, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ 0, /* super_class */ 2, /* num_keys */ 0xD1D41B62, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_DataFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0xCE1F7591, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_DeviceFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0xB3825686, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_Directory_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x771AB4F7, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_DirectoryContainsFile_GroupComponent; @@ -27,6 +27,7 @@ "GroupComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_Directory::static_meta_class, CIMPLE_OFF(CIM_DirectoryContainsFile,GroupComponent) }; @@ -42,14 +43,15 @@ "PartComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_LogicalFile::static_meta_class, CIMPLE_OFF(CIM_DirectoryContainsFile,PartComponent) }; static Meta_Feature* _CIM_DirectoryContainsFile_MFA[] = { - (Meta_Feature*)&_CIM_DirectoryContainsFile_GroupComponent, - (Meta_Feature*)&_CIM_DirectoryContainsFile_PartComponent, + (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_GroupComponent, + (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_PartComponent, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ &CIM_Component::static_meta_class, 2, /* num_keys */ 0xB7798F04, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_FIFOPipeFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x3E090D33, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_FileIdentity_SystemElement; @@ -27,6 +27,7 @@ "SystemElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_LogicalFile::static_meta_class, CIMPLE_OFF(CIM_FileIdentity,SystemElement) }; @@ -42,14 +43,15 @@ "SameElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_UnixFile::static_meta_class, CIMPLE_OFF(CIM_FileIdentity,SameElement) }; static Meta_Feature* _CIM_FileIdentity_MFA[] = { - (Meta_Feature*)&_CIM_FileIdentity_SystemElement, - (Meta_Feature*)&_CIM_FileIdentity_SameElement, + (Meta_Feature*)(void*)&_CIM_FileIdentity_SystemElement, + (Meta_Feature*)(void*)&_CIM_FileIdentity_SameElement, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ &CIM_LogicalIdentity::static_meta_class, 2, /* num_keys */ 0xFFB6B12C, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -45,15 +45,15 @@ static Meta_Feature* _CIM_LogicalElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_ManagedSystemElement_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, }; static const Meta_Feature_Local _locals[] = @@ -83,8 +83,9 @@ &CIM_ManagedSystemElement::static_meta_class, 0, /* num_keys */ 0x65D846FD, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,7 +71,6 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -314,30 +314,30 @@ static Meta_Feature* _CIM_LogicalFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -382,8 +382,9 @@ &CIM_LogicalElement::static_meta_class, 6, /* num_keys */ 0x2D6A6CBB, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_LogicalIdentity_SystemElement; @@ -27,6 +27,7 @@ "SystemElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_LogicalIdentity,SystemElement) }; @@ -42,14 +43,15 @@ "SameElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_LogicalIdentity,SameElement) }; static Meta_Feature* _CIM_LogicalIdentity_MFA[] = { - (Meta_Feature*)&_CIM_LogicalIdentity_SystemElement, - (Meta_Feature*)&_CIM_LogicalIdentity_SameElement, + (Meta_Feature*)(void*)&_CIM_LogicalIdentity_SystemElement, + (Meta_Feature*)(void*)&_CIM_LogicalIdentity_SameElement, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ 0, /* super_class */ 2, /* num_keys */ 0x73E9D550, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -69,9 +69,9 @@ static Meta_Feature* _CIM_ManagedElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, }; static const Meta_Feature_Local _locals[] = @@ -95,8 +95,9 @@ 0, /* super_class */ 0, /* num_keys */ 0x5B2A3886, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -129,15 +129,15 @@ static Meta_Feature* _CIM_ManagedSystemElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_ManagedSystemElement_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, }; static const Meta_Feature_Local _locals[] = @@ -167,8 +167,9 @@ &CIM_ManagedElement::static_meta_class, 0, /* num_keys */ 0x0DD66B62, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,7 +71,6 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -107,31 +107,31 @@ static Meta_Feature* _CIM_SymbolicLink_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_SymbolicLink_TargetFile, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_SymbolicLink_TargetFile, }; static const Meta_Feature_Local _locals[] = @@ -177,8 +177,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x6A3588EC, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -192,36 +192,36 @@ static Meta_Feature* _CIM_UnixDeviceFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceFileType, - (Meta_Feature*)&_CIM_UnixDeviceFile_OtherTypeDescription, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceId, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceDescription, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceMajor, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceMinor, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceFileType, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_OtherTypeDescription, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceId, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceDescription, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceMajor, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceMinor, }; static const Meta_Feature_Local _locals[] = @@ -272,8 +272,9 @@ &CIM_DeviceFile::static_meta_class, 6, /* num_keys */ 0xD5640978, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; @@ -98,7 +96,7 @@ // CIM_DeviceFile features: // CIM_UnixDeviceFile features: - struct + struct _DeviceFileType { enum { @@ -109,7 +107,6 @@ }; uint16 value; uint8 null; - char padding[40]; } DeviceFileType; Property<String> OtherTypeDescription; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -107,31 +107,31 @@ static Meta_Feature* _CIM_UnixDirectory_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_UnixDirectory_FileSizeBits, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feat... [truncated message content] |