--- parser3/src/include/pa_pool.h 2001/01/27 15:00:04 1.7 +++ parser3/src/include/pa_pool.h 2001/01/29 17:01:51 1.14 @@ -1,5 +1,5 @@ /* - $Id: pa_pool.h,v 1.7 2001/01/27 15:00:04 paf Exp $ + $Id: pa_pool.h,v 1.14 2001/01/29 17:01:51 paf Exp $ */ #ifndef PA_POOL_H @@ -10,6 +10,7 @@ #include "pa_string.h" #include "pa_hash.h" #include "pa_array.h" +//#include "pa_table.h" class Pool { public: @@ -18,21 +19,29 @@ 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); } - String *make_string(char *src) { - return new(this) String(this, src); + Hash& make_hash() { + return *new(this) Hash(this, false); } - Hash *make_hash() { - return new(this) Hash(this); + Hash& make_thread_safe_hash() { + 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); + Array& make_array(int 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); + }*/ + +private: //disabled + + Pool(Pool&) {} + Pool& operator = (Pool&) { return *this; } }; #endif