mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/jonas/src/mysql-4.1

Browse source 
into mysql.com:/home/jonas/src/gcc34
This commit is contained in:
joreland@mysql.com 2004-07-04 21:20:39 +02:00
commit f5294ebd5a
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ndb/src/kernel/vm/ArrayPool.hpp
View file

@ -795,8 +795,8 @@ inline
void
UnsafeArrayPool<T>::getPtrForce(Ptr<T> & 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<T>::getPtr",
__FILE__, __LINE__);
@ -808,8 +808,8 @@ inline
void
UnsafeArrayPool<T>::getPtrForce(ConstPtr<T> & 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<T>::getPtr",
__FILE__, __LINE__);
@ -820,8 +820,8 @@ template <class T>
inline
T *
UnsafeArrayPool<T>::getPtrForce(Uint32 i){
if(i < size){
return &theArray[i];
if(i < this->size){
return &this->theArray[i];
} else {
ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr",
__FILE__, __LINE__);
@ -833,8 +833,8 @@ template <class T>
inline
const T *
UnsafeArrayPool<T>::getConstPtrForce(Uint32 i) const {
if(i < size){
return &theArray[i];
if(i < this->size){
return &this->theArray[i];
} else {
ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr",
__FILE__, __LINE__);
@ -847,8 +847,8 @@ inline
void
UnsafeArrayPool<T>::getPtrForce(Ptr<T> & 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<T>::getPtr",
@ -861,8 +861,8 @@ inline
void
UnsafeArrayPool<T>::getPtrForce(ConstPtr<T> & 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<T>::getPtr",

4
ndb/src/kernel/vm/DLFifoList.hpp
View file

@ -153,11 +153,11 @@ public:
LocalDLFifoList(ArrayPool<T> & thePool, typename DLFifoList<T>::Head & _src)
: DLFifoList<T>(thePool), src(_src)
{
head = src;
this->head = src;
}
~LocalDLFifoList(){
src = head;
src = this->head;
}
private:
typename DLFifoList<T>::Head & src;

4
ndb/src/kernel/vm/DLList.hpp
View file

@ -169,11 +169,11 @@ public:
LocalDLList(ArrayPool<T> & thePool, typename DLList<T>::Head & _src)
: DLList<T>(thePool), src(_src)
{
head = src;
this->head = src;
}
~LocalDLList(){
src = head;
src = this->head;
}
private:
typename DLList<T>::Head & src;

4
ndb/src/kernel/vm/DataBuffer.hpp
View file

@ -174,11 +174,11 @@ public:
typename DataBuffer<sz>::Head & _src)
: DataBuffer<sz>(thePool), src(_src)
{
head = src;
this->head = src;
}
~LocalDataBuffer(){
src = head;
src = this->head;
}
private:
typename DataBuffer<sz>::Head & src;

4
ndb/src/kernel/vm/SLList.hpp
View file

@ -137,11 +137,11 @@ public:
LocalSLList(ArrayPool<T> & thePool, typename SLList<T>::Head & _src)
: SLList<T>(thePool), src(_src)
{
head = src;
this->head = src;
}
~LocalSLList(){
src = head;
src = this->head;
}
private:
typename SLList<T>::Head & src;