Menu
▾
▴
[Sblim-commit] cmpi-devel ChangeLog,1.2,1.3 CmpiImpl.cpp,1.2,1.3 NEWS,1.2,1.3 configure.ac,1.3,1.4
|
From: Viktor M. <mih...@us...> - 2005-05-13 14:31:52
|
Update of /cvsroot/sblim/cmpi-devel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20639 Modified Files: ChangeLog CmpiImpl.cpp NEWS configure.ac Log Message: Bugs Fixed: 1201389. C++ CMPI Wrapper Providers won't compile with 1.0.0 and must use this level instead. Index: NEWS =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NEWS 11 May 2005 11:04:09 -0000 1.2 +++ NEWS 13 May 2005 14:31:42 -0000 1.3 @@ -1,3 +1,9 @@ +Changes in 1.0.1 +================ + +Bugs fixed: +- 1201389 Fixed CMPI C++ Providers Build Break + Changes in 1.0.0 ================ Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- configure.ac 10 May 2005 15:50:18 -0000 1.3 +++ configure.ac 13 May 2005 14:31:42 -0000 1.4 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(sblim-cmpi-devel, 1.0.0, <mih...@de...>) +AC_INIT(sblim-cmpi-devel, 1.0.1, <mih...@de...>) AC_CONFIG_SRCDIR([CmpiImpl.cpp]) AC_CONFIG_HEADER([config.h]) Index: CmpiImpl.cpp =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CmpiImpl.cpp 10 May 2005 15:50:17 -0000 1.2 +++ CmpiImpl.cpp 13 May 2005 14:31:42 -0000 1.3 @@ -58,10 +58,10 @@ } CMPIStatus CmpiBaseMI::driveBaseCleanup - (void* vi, CMPIContext* eCtx) { + (void* vi, const CMPIContext* eCtx, CMPIBoolean *b) { try { CMPIInstanceMI *mi=( CMPIInstanceMI*)vi; - CmpiContext ctx(eCtx); + CmpiContext ctx((CMPIContext*)eCtx); CmpiStatus rc(CMPI_RC_OK); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*>(mi->hdl); if (cmi->isUnloadable()) { @@ -113,13 +113,13 @@ //--------------------------------------------------- CMPIStatus CmpiInstanceMI::driveEnumInstanceNames - (CMPIInstanceMI* mi,CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->enumInstanceNames(ctx,rslt,cop).status(); @@ -130,17 +130,17 @@ } CMPIStatus CmpiInstanceMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->enumInstances - (ctx,rslt,cop,(const char**)properties).status(); + (ctx,rslt,cop,properties).status(); } catch (CmpiStatus& stat) { cerr << "caught status :" << stat.rc() << " " << stat.msg() << endl; return stat.status(); @@ -148,17 +148,17 @@ } CMPIStatus CmpiInstanceMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->getInstance - (ctx,rslt,cop,(const char**)properties).status(); + (ctx,rslt,cop,properties).status(); } catch (CmpiStatus& stat) { cerr << "caught status :" << stat.rc() << " " << stat.msg() << endl; return stat.status(); @@ -166,13 +166,13 @@ } CMPIStatus CmpiInstanceMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiInstance inst(eInst); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); @@ -185,13 +185,14 @@ } CMPIStatus CmpiInstanceMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiInstance inst(eInst); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); @@ -204,13 +205,13 @@ } CMPIStatus CmpiInstanceMI::driveDeleteInstance - (CMPIInstanceMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop) + (CMPIInstanceMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->deleteInstance @@ -222,13 +223,13 @@ } CMPIStatus CmpiInstanceMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eCop); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiInstanceMI* imi = dynamic_cast<CmpiInstanceMI*>(cmi); return imi->execQuery @@ -298,13 +299,13 @@ //--------------------------------------------------- CMPIStatus CmpiAssociationMI::driveAssociators - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, - const char* role, const char* resultRole, char** properties) { + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->associators @@ -318,13 +319,13 @@ } CMPIStatus CmpiAssociationMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->associatorNames @@ -338,13 +339,13 @@ } CMPIStatus CmpiAssociationMI::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) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->references @@ -357,12 +358,12 @@ } CMPIStatus CmpiAssociationMI::driveReferenceNames - (CMPIAssociationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eOp, const char* resultClass, const char* role) { + (CMPIAssociationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eOp, const char* resultClass, const char* role) { try { - CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - CmpiObjectPath cop(eOp); + CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + CmpiObjectPath cop((CMPIObjectPath*)eOp); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiAssociationMI* ami = dynamic_cast<CmpiAssociationMI*>(cmi); return ami->referenceNames @@ -420,15 +421,15 @@ //--------------------------------------------------- CMPIStatus CmpiMethodMI::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) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); - const CmpiArgs in(eIn); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); + const CmpiArgs in((CMPIArgs*)eIn); CmpiArgs out(eOut); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiMethodMI* mmi = dynamic_cast<CmpiMethodMI*>(cmi); @@ -470,12 +471,12 @@ } CMPIStatus CmpiPropertyMI::driveSetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* name, CMPIData eData) { + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* name, CMPIData eData) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiData data(eData); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiPropertyMI* pmi = dynamic_cast<CmpiPropertyMI*>(cmi); @@ -488,12 +489,12 @@ } CMPIStatus CmpiPropertyMI::driveGetProperty - (CMPIPropertyMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPIObjectPath* eCop, char* name) { + (CMPIPropertyMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPIObjectPath* eCop, const char* name) { try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiPropertyMI* pmi = dynamic_cast<CmpiPropertyMI*>(cmi); return pmi->getProperty @@ -535,13 +536,13 @@ } CMPIStatus CmpiIndicationMI::driveAuthorizeFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, const char* user){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -554,12 +555,12 @@ } CMPIStatus CmpiIndicationMI::driveMustPoll - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop){ + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -572,13 +573,13 @@ } CMPIStatus CmpiIndicationMI::driveActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, CMPIBoolean first){ - const CmpiContext ctx(eCtx); + const CmpiContext ctx((CMPIContext*)eCtx); try { - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -591,13 +592,13 @@ } CMPIStatus CmpiIndicationMI::driveDeActivateFilter - (CMPIIndicationMI* mi, CMPIContext* eCtx, CMPIResult* eRslt, - CMPISelectExp* eSe, const char* ns, CMPIObjectPath* eCop, - CMPIBoolean last){ + (CMPIIndicationMI* mi, const CMPIContext* eCtx, const CMPIResult* eRslt, + const CMPISelectExp* eSe, const char* ns, const CMPIObjectPath* eCop, + const CMPIBoolean last){ try { - const CmpiContext ctx(eCtx); - CmpiResult rslt(eRslt); - const CmpiObjectPath cop(eCop); + const CmpiContext ctx((CMPIContext*)eCtx); + CmpiResult rslt((CMPIResult*)eRslt); + const CmpiObjectPath cop((CMPIObjectPath*)eCop); const CmpiSelectExp se(eSe); CmpiBaseMI* cmi = reinterpret_cast<CmpiBaseMI*> (mi->hdl); CmpiIndicationMI* nmi = dynamic_cast<CmpiIndicationMI*>(cmi); @@ -1184,7 +1185,7 @@ CmpiObjectPath CmpiInstance::getObjectPath() const { CMPIStatus rc={CMPI_RC_OK,NULL}; - CmpiObjectPath cop(getEnc()->ft->getObjectPath(getEnc(),&rc)); + CmpiObjectPath cop((CMPIObjectPath*)getEnc()->ft->getObjectPath(getEnc(),&rc)); if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc); return cop; } Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/cmpi-devel/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 10 May 2005 15:50:17 -0000 1.2 +++ ChangeLog 13 May 2005 14:31:42 -0000 1.3 @@ -1,3 +1,38 @@ +2005-05-13 <mih...@dy...> + + * CmpiImpl.cpp: + Bug 1201389: Fixed the implementation of the MI driver functions, + mainly function signatures and type casts. + + * CmpiAssociationMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiBaseMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiIndicationMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiInstanceMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiMethodMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * CmpiPropertyMI.h: + Bug 1201389: Adapted driveXyz.. function signatures to fit new cmpift.h + declarations. + + * cmpimacs.h: + Bug 1201389: Added typecasts in the MI factory macros to allow + clean compilation. + + 2005-05-10 <mih...@dy...> * CmpiImpl.cpp: Bug 1199111 Changed from setInstance to modifyInstance. |
