diff --git a/ChangeLog b/ChangeLog index a5dc7b551..e1e416cb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-15 Robert Larice + * src/spicelib/devices/cktask.c , + * src/spicelib/parser/inp2m.c : + drop (GENinstance*) casts, which are no longer necessary + 2010-08-15 Robert Larice * src/spicelib/devices/asrc/asrcset.c , * src/spicelib/devices/ccvs/ccvsset.c , diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c index 1ad840697..7500f626b 100644 --- a/src/spicelib/devices/cktask.c +++ b/src/spicelib/devices/cktask.c @@ -17,7 +17,7 @@ Author: 1985 Thomas L. Quarles int CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *selector) { - GENinstance *instance = (GENinstance *) fast; + GENinstance *instance = /*fixme*/ fast; int type = instance->GENmodPtr->GENmodType; int error; #ifdef PARALLEL_ARCH @@ -29,7 +29,7 @@ CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *s DEVices = devices(); if((*DEVices[type]).DEVask) { error = DEVices[type]->DEVask(ckt, - (GENinstance *)fast,which,value,selector); + fast, which, value, selector); } else { error = E_BADPARM; } diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c index 96f389349..353628fe0 100644 --- a/src/spicelib/parser/inp2m.c +++ b/src/spicelib/parser/inp2m.c @@ -272,19 +272,19 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current) switch (nodeflag) { case 0: - ((GENinstance *) fast)->GENnode5 = -1; - ((GENinstance *) fast)->GENnode6 = -1; - ((GENinstance *) fast)->GENnode7 = -1; + fast->GENnode5 = -1; + fast->GENnode6 = -1; + fast->GENnode7 = -1; break; case 1: IFC (bindNode, (ckt, fast, 5, node5)) - ((GENinstance *) fast)->GENnode6 = -1; - ((GENinstance *) fast)->GENnode7 = -1; + fast->GENnode6 = -1; + fast->GENnode7 = -1; break; case 2: IFC (bindNode, (ckt, fast, 5, node5)) IFC (bindNode, (ckt, fast, 6, node6)) - ((GENinstance *) fast)->GENnode7 = -1; + fast->GENnode7 = -1; break; case 3: IFC (bindNode, (ckt, fast, 5, node5))