--- ndb/src/kernel/vm/ArrayPool.hpp.orig 2004-07-27 01:09:09 -07:00 +++ ndb/src/kernel/vm/ArrayPool.hpp 2004-07-27 01:09:09 -07:00 @@ -795,8 +795,8 @@ void UnsafeArrayPool::getPtrForce(Ptr & ptr){ Uint32 i = ptr.i; - if(i < size){ - ptr.p = &theArray[i]; + if(i < this->size){ + ptr.p = &this->theArray[i]; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", __FILE__, __LINE__); @@ -808,8 +808,8 @@ void UnsafeArrayPool::getPtrForce(ConstPtr & ptr) const{ Uint32 i = ptr.i; - if(i < size){ - ptr.p = &theArray[i]; + if(i < this->size){ + ptr.p = &this->theArray[i]; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", __FILE__, __LINE__); @@ -820,8 +820,8 @@ inline T * UnsafeArrayPool::getPtrForce(Uint32 i){ - if(i < size){ - return &theArray[i]; + if(i < this->size){ + return &this->theArray[i]; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", __FILE__, __LINE__); @@ -833,8 +833,8 @@ inline const T * UnsafeArrayPool::getConstPtrForce(Uint32 i) const { - if(i < size){ - return &theArray[i]; + if(i < this->size){ + return &this->theArray[i]; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", __FILE__, __LINE__); @@ -847,8 +847,8 @@ void UnsafeArrayPool::getPtrForce(Ptr & ptr, Uint32 i){ ptr.i = i; - if(i < size){ - ptr.p = &theArray[i]; + if(i < this->size){ + ptr.p = &this->theArray[i]; return ; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", @@ -861,8 +861,8 @@ void UnsafeArrayPool::getPtrForce(ConstPtr & ptr, Uint32 i) const{ ptr.i = i; - if(i < size){ - ptr.p = &theArray[i]; + if(i < this->size){ + ptr.p = &this->theArray[i]; return ; } else { ErrorReporter::handleAssert("UnsafeArrayPool::getPtr", diff -Nru a/ndb/src/kernel/vm/DLFifoList.hpp b/ndb/src/kernel/vm/DLFifoList.hpp --- ndb/src/kernel/vm/DLFifoList.hpp.orig 2004-07-27 01:09:09 -07:00 +++ ndb/src/kernel/vm/DLFifoList.hpp 2004-07-27 01:09:09 -07:00 @@ -153,11 +153,11 @@ LocalDLFifoList(ArrayPool & thePool, typename DLFifoList::Head & _src) : DLFifoList(thePool), src(_src) { - head = src; + this->head = src; } ~LocalDLFifoList(){ - src = head; + src = this->head; } private: typename DLFifoList::Head & src; diff -Nru a/ndb/src/kernel/vm/DLList.hpp b/ndb/src/kernel/vm/DLList.hpp --- ndb/src/kernel/vm/DLList.hpp.orig 2004-07-27 01:09:09 -07:00 +++ ndb/src/kernel/vm/DLList.hpp 2004-07-27 01:09:09 -07:00 @@ -169,11 +169,11 @@ LocalDLList(ArrayPool & thePool, typename DLList::Head & _src) : DLList(thePool), src(_src) { - head = src; + this->head = src; } ~LocalDLList(){ - src = head; + src = this->head; } private: typename DLList::Head & src; diff -Nru a/ndb/src/kernel/vm/DataBuffer.hpp b/ndb/src/kernel/vm/DataBuffer.hpp --- ndb/src/kernel/vm/DataBuffer.hpp.orig 2004-07-27 01:09:09 -07:00 +++ ndb/src/kernel/vm/DataBuffer.hpp 2004-07-27 01:09:09 -07:00 @@ -174,11 +174,11 @@ typename DataBuffer::Head & _src) : DataBuffer(thePool), src(_src) { - head = src; + this->head = src; } ~LocalDataBuffer(){ - src = head; + src = this->head; } private: typename DataBuffer::Head & src; diff -Nru a/ndb/src/kernel/vm/SLList.hpp b/ndb/src/kernel/vm/SLList.hpp --- ndb/src/kernel/vm/SLList.hpp.orig 2004-07-27 01:09:09 -07:00 +++ ndb/src/kernel/vm/SLList.hpp 2004-07-27 01:09:09 -07:00 @@ -137,11 +137,11 @@ LocalSLList(ArrayPool & thePool, typename SLList::Head & _src) : SLList(thePool), src(_src) { - head = src; + this->head = src; } ~LocalSLList(){ - src = head; + src = this->head; } private: typename SLList::Head & src;