--- parser3/src/include/pa_pool.h 2001/01/29 16:37:58 1.13 +++ parser3/src/include/pa_pool.h 2001/01/29 20:46:22 1.16 @@ -1,5 +1,5 @@ /* - $Id: pa_pool.h,v 1.13 2001/01/29 16:37:58 paf Exp $ + $Id: pa_pool.h,v 1.16 2001/01/29 20:46:22 paf Exp $ */ #ifndef PA_POOL_H @@ -9,7 +9,7 @@ #include "pa_string.h" #include "pa_hash.h" -//#include "pa_array.h" +#include "pa_array.h" //#include "pa_table.h" class Pool { @@ -19,21 +19,21 @@ public: void *malloc(size_t size); void *calloc(size_t size); - String& make_string() { - return *new(this) String(this); + String& make_string() { + return *new(*this) String(*this); } Hash& make_hash() { - return *new(this) Hash(this, false); + return *new(*this) Hash(*this, false); } Hash& make_thread_safe_hash() { - return *new(this) Hash(this, true); + return *new(*this) Hash(*this, true); } -/* Array& make_array() { - return *new(this) Array(this); + Array& make_array() { + return *new(*this) Array(*this); } Array& make_array(int initial_rows) { - return *new(this) Array(this, initial_rows); - }*/ + return *new(*this) Array(*this, initial_rows); + } /*Table& make_table(char *afile, uint aline, Array *acolumns, int initial_rows) { return *new(this) Table(this, afile, aline, acolumns, initial_rows); }*/ @@ -41,7 +41,7 @@ public: private: //disabled Pool(Pool&) {} - Pool& operator = (Pool&) { return *this; } + Pool& operator = (const Pool&) { return *this; } }; #endif