--------------------- PatchSet 6199 Date: 2007/11/27 19:34:54 Author: chtsanti Branch: async-calls Tag: (none) Log: Removing the thePipe and theProducer members from BodyProducerCall class and thePipe and theConsumer from BodyConsumerCall class. This objects can obtained from theDialer class variable. Members: src/BodyPipe.cc:1.7.4.4->1.7.4.5 Index: squid3/src/BodyPipe.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/BodyPipe.cc,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -u -r1.7.4.4 -r1.7.4.5 --- squid3/src/BodyPipe.cc 27 Nov 2007 18:58:54 -0000 1.7.4.4 +++ squid3/src/BodyPipe.cc 27 Nov 2007 19:34:54 -0000 1.7.4.5 @@ -38,17 +38,16 @@ BodyProducerCall(BodyProducer *aProducer, noteConsumerHandler aHandler, BodyPipe::Pointer bp, const char *callName): - Parent(MemFun(aProducer, aHandler, bp), 93, 5, callName),thePipe(bp),theProducer(aProducer){} + Parent(MemFun(aProducer, aHandler, bp), 93, 5, callName){} virtual bool fire() { + BodyPipe::Pointer thePipe = theDialer.arg1(); + BodyProducer *theProducer = theDialer.object(); assert(theProducer); if(!cbdataReferenceValid(theCbdata)) return false; return !theProducer->ignoreLateConsumerNote(thePipe) && Parent::fire(); } -private: - BodyPipe::Pointer thePipe; - BodyProducer *theProducer; }; @@ -61,17 +60,16 @@ BodyConsumerCall(BodyConsumer *aConsumer, noteProducerHandler aHandler, BodyPipe::Pointer bp, const char *callName): - Parent(MemFun(aConsumer, aHandler, bp), 93, 5, callName),thePipe(bp),theConsumer(aConsumer){} + Parent(MemFun(aConsumer, aHandler, bp), 93, 5, callName){} virtual bool fire() { + BodyPipe::Pointer thePipe = theDialer.arg1(); + BodyConsumer *theConsumer = theDialer.object(); assert(theConsumer); if(!cbdataReferenceValid(theCbdata)) return false; return !theConsumer->ignoreLateProducerNote(thePipe) && Parent::fire(); } -private: - BodyPipe::Pointer thePipe; - BodyConsumer *theConsumer; };