Menu
▾
▴
[Sblim-commit] cmpi-devel/cmpi CmpiAssociationMI.h,1.1.1.1,1.2 CmpiBaseMI.h,1.1.1.1,1.2 CmpiIndicationMI.h,1.1.1.1,1.2 CmpiInstanceMI.h,1.1.1.1,1.2 CmpiMethodMI.h,1.1.1.1,1.2 CmpiPropertyMI.h,1.1.1.1,1.2 cmpimacs.h,1.2,1.3
Update of /cvsroot/sblim/cmpi-devel/cmpi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20639/cmpi Modified Files: CmpiAssociationMI.h CmpiBaseMI.h CmpiIndicationMI.h CmpiInstanceMI.h CmpiMethodMI.h CmpiPropertyMI.h cmpimacs.h Log Message: Bugs Fixed: 1201389. C++ CMPI Wrapper Providers won't compile with 1.0.0 and must use this level instead. Index: CmpiInstanceMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiInstanceMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiInstanceMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiInstanceMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -43,26 +43,27 @@ CmpiInstanceMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveEnumInstanceNames - (CMPIInstanceMI* mi,CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop); static CMPIStatus driveEnumInstances - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties); static CMPIStatus driveGetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* *properties); static CMPIStatus driveCreateInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst); static CMPIStatus driveSetInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, CMPIInstance* eInst, char* *properties); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const CMPIInstance* eInst, + const char* *properties); static CMPIStatus driveDeleteInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop); static CMPIStatus driveExecQuery - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* language ,char* query); + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* language ,const char* query); virtual CmpiStatus enumInstanceNames Index: CmpiAssociationMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiAssociationMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiAssociationMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiAssociationMI.h 13 May 2005 14:31:42 -0000 1.2 @@ -41,20 +41,20 @@ CmpiAssociationMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveAssociators - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* asscClass, const char* resultClass, - const char* role, const char* resultRole, char** properties); + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* asscClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties); static CMPIStatus driveAssociatorNames - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, const char* role, const char* resultRole); static CMPIStatus driveReferences - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role , - char** properties); + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role , + const char** properties); static CMPIStatus driveReferenceNames - (CMPIAssociationMI*, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role); + (CMPIAssociationMI*, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role); virtual CmpiStatus associators (const CmpiContext& ctx, CmpiResult& rslt, Index: CmpiIndicationMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiIndicationMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiIndicationMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiIndicationMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -42,17 +42,20 @@ CmpiIndicationMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveAuthorizeFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, const char* user); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op, + const char* user); static CMPIStatus driveMustPoll - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRrslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRrslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op); static CMPIStatus driveActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, CMPIBoolean first); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, const CMPIObjectPath* op, + CMPIBoolean first); static CMPIStatus driveDeActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* se, const char* ns, CMPIObjectPath* op, CMPIBoolean last); + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* se, const char* ns, + const CMPIObjectPath* op, CMPIBoolean last); static void driveEnableIndications (CMPIIndicationMI* mi); static void driveDisableIndications Index: CmpiBaseMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiBaseMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiBaseMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiBaseMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -45,7 +45,7 @@ void setProviderBase(CmpiProviderBase* base); CmpiProviderBase* getProviderBase(); - static CMPIStatus driveBaseCleanup(void* mi, CMPIContext* eCtx); + static CMPIStatus driveBaseCleanup(void* mi, const CMPIContext* eCtx, CMPIBoolean* b); virtual CmpiStatus initialize(const CmpiContext& ctx); virtual CmpiStatus cleanup(CmpiContext& ctx); Index: CmpiMethodMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiMethodMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiMethodMI.h 18 Mar 2005 13:45:40 -0000 1.1.1.1 +++ CmpiMethodMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -43,9 +43,9 @@ CmpiMethodMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveInvokeMethod - (CMPIMethodMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, const char* methodName, - CMPIArgs* eIn, CMPIArgs* eOut); + (CMPIMethodMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* methodName, + const CMPIArgs* eIn, CMPIArgs* eOut); virtual CmpiStatus invokeMethod (const CmpiContext& ctx, CmpiResult& rslt, Index: CmpiPropertyMI.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiPropertyMI.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CmpiPropertyMI.h 18 Mar 2005 13:45:39 -0000 1.1.1.1 +++ CmpiPropertyMI.h 13 May 2005 14:31:43 -0000 1.2 @@ -42,11 +42,11 @@ CmpiPropertyMI(const CmpiBroker &mbp, const CmpiContext& ctx); static CMPIStatus driveSetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, char* name, CMPIData data); + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* name, CMPIData data); static CMPIStatus driveGetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, char* name); + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* name); virtual CmpiStatus setProperty (const CmpiContext& ctx, CmpiResult& rslt, Index: cmpimacs.h =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/cmpi/cmpimacs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmpimacs.h 10 May 2005 15:50:21 -0000 1.2 +++ cmpimacs.h 13 May 2005 14:31:43 -0000 1.3 @@ -2102,7 +2102,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "instance" #pn, \ - (CMPIStatus(*)(CMPIInstanceMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIInstanceMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiInstanceMI::driveEnumInstanceNames, \ CmpiInstanceMI::driveEnumInstances, \ CmpiInstanceMI::driveGetInstance, \ @@ -2113,11 +2113,11 @@ }; \ static CMPIInstanceMI mi; \ fprintf(stderr,"--- _Create_InstanceMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&instMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2150,7 +2150,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "association" #pn, \ - (CMPIStatus(*)(CMPIAssociationMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIAssociationMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiAssociationMI::driveAssociators, \ CmpiAssociationMI::driveAssociatorNames, \ CmpiAssociationMI::driveReferences, \ @@ -2158,11 +2158,11 @@ }; \ static CMPIAssociationMI mi; \ fprintf(stderr,"--- _Create_AssociationMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&assocMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2195,16 +2195,16 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "method" #pn, \ - (CMPIStatus(*)(CMPIMethodMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIMethodMI*,const CMPIContext*, CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiMethodMI::driveInvokeMethod, \ }; \ static CMPIMethodMI mi; \ fprintf(stderr,"--- _Create_MethodMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&methMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2236,17 +2236,17 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "property" #pn, \ - (CMPIStatus(*)(CMPIPropertyMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIPropertyMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiPropertyMI::driveSetProperty, \ CmpiPropertyMI::driveGetProperty, \ }; \ static CMPIPropertyMI mi; \ fprintf(stderr,"--- _Create_MethodMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&propMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ @@ -2287,7 +2287,7 @@ CMPICurrentVersion, \ CMPICurrentVersion, \ "indication" #pn, \ - (CMPIStatus(*)(CMPIIndicationMI*,CMPIContext*))CmpiBaseMI::driveBaseCleanup, \ + (CMPIStatus(*)(CMPIIndicationMI*,const CMPIContext*,CMPIBoolean*))CmpiBaseMI::driveBaseCleanup, \ CmpiIndicationMI::driveAuthorizeFilter, \ CmpiIndicationMI::driveMustPoll, \ CmpiIndicationMI::driveActivateFilter, \ @@ -2296,11 +2296,11 @@ }; \ static CMPIIndicationMI mi; \ fprintf(stderr,"--- _Create_IndicationMI() broker: %p\n",broker); \ - CmpiContext ctx(ctxp); \ + CmpiContext ctx((CMPIContext*)ctxp); \ mi.ft=&indMIFT; \ CmpiBaseMI *provider=base##pn.getBaseMI(); \ if (provider == 0) {\ - provider = new cn(CmpiBroker(broker),ctx); \ + provider = new cn(CmpiBroker((CMPIBroker*)broker),ctx); \ provider->setProviderBase(&base##pn); \ provider->initialize(ctx); \ base##pn.setBaseMI(provider); \ |
