--- parser3/src/include/pa_array.h 2003/01/28 11:18:01 1.57.2.12 +++ parser3/src/include/pa_array.h 2003/01/29 13:52:21 1.57.2.14 @@ -8,7 +8,7 @@ #ifndef PA_ARRAY_H #define PA_ARRAY_H -static const char* IDENT_ARRAY_Y="$Date: 2003/01/28 11:18:01 $"; +static const char* IDENT_ARRAY_Y="$Date: 2003/01/29 13:52:21 $"; #include "pa_pool.h" #include "pa_exception.h" @@ -23,9 +23,20 @@ template class Array: public friend class Array_iterator; +protected: + + // default expand delta size + int fdelta; + + /// elements[growing size] here + T *felements; + // allocated size int fallocated; + // array size + int fused; + public: typedef T element_type; @@ -131,15 +142,6 @@ public: protected: - // default expand delta size - int fdelta; - - /// elements[growing size] here - T *felements; - - // array size - int fused; - bool is_full() { return fused == fallocated; } @@ -173,7 +175,7 @@ public: } }; -void *operator new(size_t size, Pool& pool) { +inline void *operator new(size_t size, Pool& pool) { return pool.malloc(size); }